Merge branch 'master' into 'test'

geoserver See merge request !13

Merge branch 'master' into 'test'
geoserver See merge request !13
7b9815cb · gaoming · e60d0116 · e6f4d7bc · 7b9815cb
Commit 7b9815cb authored Sep 20, 2019 by gaoming
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

settings.py geoserver/settings.py +3 -3

No files found.
--- a/geoserver/settings.py
+++ b/geoserver/settings.py
@@ -158,5 +158,5 @@ REDIS_PASSWORD=""
 REDIS_PORT=6379
 REDIS_DB=0

-#如果是我的电脑就加载本地配置文件
-#from .settings_local import *
\ No newline at end of file
+#加载配置文件
+from .settings_local import *
\ No newline at end of file