github-code/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 committed 2015-03-31 16:56:26 +08:00
1 parent 5fae5dd10e
commit f959694b0f
18 files changed
+34 -139
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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