Commit f4709d26 authored by testshenbd's avatar testshenbd

editconflicts

parents 075b3620 75f395eb
...@@ -13,7 +13,9 @@ application.dispatcher.catchException = true ...@@ -13,7 +13,9 @@ application.dispatcher.catchException = true
application.modules = Index,Api,Admin,Client application.modules = Index,Api,Admin,Client
redis.redisPublishName='redisPublish' redis.redisPublishName='redisPublish'
[productone : common] [productone : common]
; 数据库配置 ; 数据库配置
resources.database.params.driver = "pdo_mysql" resources.database.params.driver = "pdo_mysql"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment