fix modules

diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index 7019a92aa312f571938d29c0c776b404ba0ee8fb..62a49f4e9cc242b617fe8a4d597b2f60cba6ef3c 100644 (file)
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@ -159,12 +159,9 @@ INSTALLED_APPS = (
     'bootstrap_pagination',
     'googletools',
     'registration',
-<<<<<<< HEAD:example/sandbox/settings.py
-    'haystack',
-=======
     'rest_framework',
     'djcelery',
->>>>>>> dev:examples/sandbox/settings.py
+    'haystack',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (