Fixed additional conflicts from previous merge
[pithos] / snf-pithos-app / pithos /
drwxr-xr-x   ..
-rw-r--r-- 1740 __init__.py
drwxr-xr-x - api
drwxr-xr-x - middleware
-rw-r--r-- 400 synnefo_settings.py
-rw-r--r-- 1672 urls.py