From b22d176caed69ac2dd664fc41f76fa101a7d6f50 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 7 Apr 2015 12:41:54 +0200
Subject: [PATCH] fix modules

---
 examples/sandbox/settings.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 = (
-- 
2.39.5