From f959694b0fb1ac7beaf99db83449601de0a31de5 Mon Sep 17 00:00:00 2001 From: life Date: Tue, 31 Mar 2015 16:56:26 +0800 Subject: [PATCH] fix conflict --- app/init.go | 8 +-- app/service/UserService.go | 6 -- app/views/note/note.html | 4 +- conf/app.conf | 11 --- conf/routes | 4 -- public/blog/themes/default/theme.json | 3 - public/blog/themes/elegant/theme.json | 3 - public/blog/themes/nav_fixed/theme.json | 3 - public/js/all.js | 2 +- public/js/app/note-min.js | 5 -- public/js/app/notebook-min.js | 5 -- public/js/app/notebook.js | 18 +---- public/js/app/tag-min.js | 5 -- public/js/app/tag.js | 72 +++++++------------ public/tinymce/plugins/paste/plugin.dev.js | 6 +- .../plugins/spellchecker/plugin.min.js | 6 +- public/tinymce/tinymce.dev.js | 6 +- public/tinymce/tinymce.jquery.dev.js | 6 +- 18 files changed, 34 insertions(+), 139 deletions(-) delete mode 100644 public/js/app/note-min.js delete mode 100644 public/js/app/notebook-min.js delete mode 100644 public/js/app/tag-min.js diff --git a/app/init.go b/app/init.go index d6435ba..e5134d1 100644 --- a/app/init.go +++ b/app/init.go @@ -374,12 +374,6 @@ func init() { admin.InitService() member.InitService() service.ConfigS.InitGlobalConfigs() -<<<<<<< HEAD - }); -} -======= api.InitService() }) - -} ->>>>>>> dev-life +} \ No newline at end of file diff --git a/app/service/UserService.go b/app/service/UserService.go index ad7f560..d51c014 100644 --- a/app/service/UserService.go +++ b/app/service/UserService.go @@ -119,10 +119,7 @@ func (this *UserService) GetUserInfo(userId string) info.User { func (this *UserService) GetUserInfoByEmail(email string) info.User { user := info.User{} db.GetByQ(db.Users, bson.M{"Email": email}, &user) -<<<<<<< HEAD -======= // Logo路径问题, 有些有http: 有些没有 ->>>>>>> dev-life this.setUserLogo(&user) return user } @@ -131,10 +128,7 @@ func (this *UserService) GetUserInfoByUsername(username string) info.User { user := info.User{} username = strings.ToLower(username) db.GetByQ(db.Users, bson.M{"Username": username}, &user) -<<<<<<< HEAD -======= // Logo路径问题, 有些有http: 有些没有 ->>>>>>> dev-life this.setUserLogo(&user) return user } diff --git a/app/views/note/note.html b/app/views/note/note.html index e0e870c..a235260 100644 --- a/app/views/note/note.html +++ b/app/views/note/note.html @@ -713,7 +713,7 @@ function log(o) {