Преглед на файлове

Accept Merge Request #64 merge : (master -> test)

Merge Request: merge
Created By: @albertshaw
Accepted By: @albertshaw
URL: https://coding.net/t/aft/p/AFT/git/merge/64
albertshaw преди 9 години
родител
ревизия
f03da08e46

+ 2 - 5
src/main/resources/props/config_dev.properties

@@ -50,11 +50,8 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-<<<<<<< HEAD
-static.host=//afts.hnzhiming.com/1.0.5
-=======
-static.host=//afts.hnzhiming.com/1.0.4
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+
+static.host=//afts.hnzhiming.com/1.0.5
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 2 - 4
src/main/resources/props/config_local.properties

@@ -52,11 +52,9 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-<<<<<<< HEAD
+
 static.host=//afts.hnzhiming.com/1.0.5
-=======
-static.host=//afts.hnzhiming.com/1.0.4
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 4
src/main/resources/props/config_prod.properties

@@ -50,8 +50,5 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-<<<<<<< HEAD
+
 static.host=//afts.hnzhiming.com/1.0.5
-=======
-static.host=//afts.hnzhiming.com/1.0.4
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git

+ 2 - 5
src/main/resources/props/config_test.properties

@@ -52,11 +52,8 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-<<<<<<< HEAD
-static.host=//aftts.hnzhiming.com/1.0.5
-=======
-static.host=//aftts.hnzhiming.com/1.0.4
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+
+static.host=//aftts.hnzhiming.com/1.0.5
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload