From: yomguy <yomguy@parisson.com>
Date: Wed, 11 Jul 2012 09:33:53 +0000 (+0200)
Subject: fix settings
X-Git-Tag: 0.7-dev~14^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=903bf1fe2a5c53b6d11b619989cb7a8956311bd4;p=teleforma.git

fix settings
---

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