Fixed additional conflicts from previous merge
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 22 Feb 2012 11:45:55 +0000 (13:45 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 22 Feb 2012 11:45:55 +0000 (13:45 +0200)
commit4a669c711b7baf8c71cdde46959eb05cb7221ad9
tree33c3a42ff077fca9e6355f874a97ec69a6235002
parentf388beb9b3093a05c9586f2842eaa9d58cdaaa87
Fixed additional conflicts from previous merge
docs/source/conf.py
snf-pithos-app/pithos/api/synnefo_settings.py
snf-pithos-app/pithos/synnefo_settings.py
snf-pithos-app/pithos/ui/__init__.py [deleted file]
snf-pithos-app/pithos/ui/settings.py [deleted file]
snf-pithos-app/pithos/ui/urls.py [deleted file]
snf-pithos-backend/pithos/backends/settings.py [deleted file]
snf-pithos-backend/setup.py