add

0952087c · lixiaofang · d8fdc11c · 0952087c · 0952087c
Commit 0952087c authored Mar 13, 2019 by lixiaofang
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

workspace.xml .idea/workspace.xml +0 -0

settings.py physical/settings.py +0 -1

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/physical/settings.py
+++ b/physical/settings.py
@@ -14,7 +14,6 @@ import os
 from .log_settings import *
 from datetime import timedelta
 from celery.schedules import crontab
-<<<<<<< HEAD

 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))