文件project.config.json文件冲突

project.config.json

@@ -37,11 +37,7 @@
 			"list": []
 		},
 		"miniprogram": {
-<<<<<<< HEAD
-			"current": 3,
-=======
-			"current": 4,
->>>>>>> 133e2d7cbbbda20f7e1a885855a832728002329a
+			"current": 6,
 			"list": [
 				{
 					"id": 0,
@@ -63,10 +59,6 @@
 				},
 				{
 					"id": -1,
-<<<<<<< HEAD
-					"name": "vip",
-					"pathName": "pages/me/vip/index"
-=======
 					"name": "搜索",
 					"pathName": "pages/search/index",
 					"query": ""
@@ -76,7 +68,17 @@
 					"name": "授权",
 					"pathName": "pages/auth/index",
 					"query": ""
->>>>>>> 133e2d7cbbbda20f7e1a885855a832728002329a
+				},
+				{
+					"id": -1,
+					"name": "个人信息",
+					"pathName": "pages/me/profile/index",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "vip",
+					"pathName": "pages/me/vip/index"
 				}
 			]
 		}