|
|
@@ -1,4 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
#Driver
|
|
|
jdbc.driverClassName=com.mysql.jdbc.Driver
|
|
|
#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
|
|
|
@@ -152,4 +151,3 @@ portal.host=//afts.hnzhiming.com/portal/1.0.5
|
|
|
patentTemplate=SMS_72005286
|
|
|
|
|
|
avatar.upload.host=//afts.hnzhiming.com/upload
|
|
|
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
|