před 7 roky · 121041e986
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
 
				+/Ansjer/settings.py merge=ours
			
--- a/Ansjer/settings.py
+++ b/Ansjer/settings.py
@@ -1,8 +1,8 @@
 
				 import os
			
 
				 
			
 
				 # SERVER_TYPE = 'local'
			
 
				-# SERVER_TYPE = 'test'
			
 
				-SERVER_TYPE = 'formal'
			
 
				+SERVER_TYPE = 'test'
			
 
				+# SERVER_TYPE = 'formal'
			
 
				 # 根目录
			
 
				 
			
 
				 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'