Browse Source

解决冲突

wanghui 8 years ago
parent
commit
05b788ca2f
1 changed files with 0 additions and 2 deletions
  1. 0 2
      src/main/resources/props/config_local.properties

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

@@ -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