fix conflict in settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 8fc84833f77cdbd6cf865ab7dd43652d59756f0a..46d7257df25dfafce90da892d04b60a8dc75cdfb 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -153,11 +153,6 @@ INSTALLED_APPS = (
     'haystack',
     'taggit',
     'gadjo',
-<<<<<<< HEAD
-    'panikdb.aa',
-    'panikweb_templates',
-=======
->>>>>>> 4d7a9be... move static & templates to panikweb project directory
     'panikweb.paniktags',
     'sorl.thumbnail',
     'ckeditor',