xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
life
2015-03-31 16:56:26 +08:00
parent 5fae5dd10e
commit f959694b0f
18 changed files with 34 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/init.go
View File

@ -374,12 +374,6 @@ func init() {
admin.InitService()
member.InitService()
service.ConfigS.InitGlobalConfigs()
<<<<<<< HEAD
});
}
=======
api.InitService()
})
}
>>>>>>> dev-life
}