fix conflicts

This commit is contained in:
life
2015-03-31 17:52:18 +08:00
parent fbf819f4d2
commit ce0e099bbd
5 changed files with 18 additions and 14 deletions

View File

@ -376,4 +376,4 @@ func init() {
service.ConfigS.InitGlobalConfigs()
api.InitService()
})
}
}