diff --git a/pages.json b/pages.json
index 027e0e1..ea8dac1 100644
--- a/pages.json
+++ b/pages.json
@@ -46,15 +46,6 @@
 		        "pagePath": "pages/login/login",
 		        "iconPath": "static/logo.png",
 		        "selectedIconPath": "static/logo.png",
-<<<<<<< .mine
-		        "text": "登录"
-
-
-
-
-
-
-=======
 		        "text": "艺术家"
 				},
 				{
@@ -62,7 +53,6 @@
 				"iconPath": "static/logo.png",
 				"selectedIconPath": "static/logo.png",
 				"text": "我的"
->>>>>>> .theirs
 				}
 			]
 	},
@@ -72,4 +62,4 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
-}
+}