From ef5ca02fbd6e3893a56b02b4ff87739ef24a0221 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Wed, 6 Jul 2016 22:42:53 +0100
Subject: [PATCH] Merge conflicts

---
 dss/settings.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dss/settings.py b/dss/settings.py
index 022d4fe..1d80e09 100755
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -258,7 +258,4 @@ DBBACKUP_STORAGE = 'dbbackup.storage.dropbox_storage'
 DBBACKUP_TOKENS_FILEPATH = '._dss_tokens'
 DBBACKUP_DROPBOX_APP_KEY = localsettings.DSS_DB_BACKUP_KEY
 DBBACKUP_DROPBOX_APP_SECRET = localsettings.DSS_DB_BACKUP_SECRET
-<<<<<<< HEAD
-=======
 """
->>>>>>> develop