Merge pull request #41 from SpringCloud/develop

SoftwareKing · web-flow · commit 432e915b390d · 2019-06-02T23:26:38.000+08:00
Resolve unresolved conflicts
diff --git a/moss-web/src/main/resources/config/application-mysql.yml b/moss-web/src/main/resources/config/application-mysql.yml
@@ -17,12 +17,4 @@ spring:
     testOnBorrow: false
     testOnReturn: false
     poolPreparedStatements: true
-<<<<<<< HEAD
     maxOpenPreparedStatements: 20
-=======
-<<<<<<< HEAD
-    maxOpenPreparedStatements: 20
-=======
-    maxOpenPreparedStatements: 20
->>>>>>> Update default config
->>>>>>> 91b037d... Update default config
