|
@@ -52,7 +52,11 @@ session.timeout=12000000
|
|
|
session.validate.timespan=18000000
|
|
session.validate.timespan=18000000
|
|
|
|
|
|
|
|
app.name=AFT
|
|
app.name=AFT
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
static.host=//afts.hnzhiming.com/1.0.5
|
|
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.path=/Users/xiaolong/Sites/upload
|
|
|
upload.private.path=/Users/xiaolong/Sites/doc
|
|
upload.private.path=/Users/xiaolong/Sites/doc
|