fix conflict

app/init.go

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

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
 }

app/views/note/note.html

@@ -713,7 +713,7 @@ function log(o) {
 			
 			<!-- 插入图片 -->
 			<div class="modal fade modal-insert-image">
-			    <div class="modal-dialog"  style="width: 840px">
+			    <div class="modal-dialog"  style="width: 840px;max-width:100%;">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <button type="button" class="close" data-dismiss="modal"
@@ -928,4 +928,4 @@ window.require = {
 <script src="/js/require.js"></script>
 </script>
 </body>
-</html>
+</html>