fix settings

diff --git a/example/settings.py b/example/settings.py
index f145c9c64618921284c4cf0f7f1c4ce502dd2b24..2dcb4509309f9bf226396f55e077e199199ca151 100644 (file)
--- 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