From 903bf1fe2a5c53b6d11b619989cb7a8956311bd4 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 11 Jul 2012 11:33:53 +0200
Subject: [PATCH] fix settings

---
 example/settings.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/example/settings.py b/example/settings.py
index f145c9c6..2dcb4509 100644
--- a/example/settings.py
+++ b/example/settings.py
@@ -187,8 +187,4 @@ POSTMAN_AUTO_MODERATE_AS = True
 
 #FILE_PROTECTION_METHOD = 'xsendfile'
 
-<<<<<<< HEAD
 TELECASTER_CONF = '/etc/telecaster/telecaster.xml'
-=======
-GOOGLE_ANALYTICS_MODEL = True
->>>>>>> dev
-- 
2.39.5