From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 7 Apr 2015 10:41:54 +0000 (+0200)
Subject: fix modules
X-Git-Tag: 1.6a^2~18^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b22d176caed69ac2dd664fc41f76fa101a7d6f50;p=telemeta.git

fix modules
---

diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index 7019a92a..62a49f4e 100644
--- 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 = (