[...]

2021-10-13 13:13:35 +08:00
parent 9e2c2bd30d
commit 3bfa9a7e20
1 changed files with 1 additions and 7 deletions
--- a/pages.json
+++ b/pages.json
@@ -20,15 +20,9 @@
 			"path": "pages/user/index",
 			"name": "User",
 			"auth": true,
-<<<<<<< HEAD
-			"style": {
-				"navigationBarTitleText": "节点中心",
-				"navigationStyle": "custom"
-=======
 			"style": {
 				"navigationBarTitleText": "节点中心",
 				"navigationStyle":"custom"
->>>>>>> 7ee3ddee638ee97b563a70fde8a6fe769589f72c
 			}
 		}, {
 			"path": "pages/user/code",