fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2025-12-22 09:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Fergal Moran
2016-07-06 22:42:53 +01:00
parent ecaa826d4f
commit ef5ca02fbd
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dss/settings.py
View File

@@ -258,7 +258,4 @@ DBBACKUP_STORAGE = 'dbbackup.storage.dropbox_storage'
DBBACKUP_TOKENS_FILEPATH = '._dss_tokens' DBBACKUP_TOKENS_FILEPATH = '._dss_tokens'
DBBACKUP_DROPBOX_APP_KEY = localsettings.DSS_DB_BACKUP_KEY DBBACKUP_DROPBOX_APP_KEY = localsettings.DSS_DB_BACKUP_KEY
DBBACKUP_DROPBOX_APP_SECRET = localsettings.DSS_DB_BACKUP_SECRET DBBACKUP_DROPBOX_APP_SECRET = localsettings.DSS_DB_BACKUP_SECRET
<<<<<<< HEAD
=======
""" """
>>>>>>> develop