Merge branch 'zhang' of http://47.108.105.48:3000/java_porject/wj_nft_small_pro into fengjiaming

# Conflicts: # .gitignore # pages.json
3 years ago · d2faf9b236
1 changed files with 1 additions and 11 deletions
--- 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
 				}
 			]
 	},