修改冲突

project.config.json

@@ -36,11 +36,7 @@
 			"list": []
 		},
 		"miniprogram": {
-<<<<<<< HEAD
 			"current": 2,
-=======
-			"current": 10,
->>>>>>> limengbo
 			"list": [
 				{
 					"id": -1,
@@ -50,7 +46,6 @@
 				},
 				{
 					"id": -1,
-<<<<<<< HEAD
 					"name": "课程详情",
 					"pathName": "pages/groupPage/collage-details/collage-details",
 					"query": "orderId=1542270071624081",
@@ -61,11 +56,6 @@
 					"name": "团购分享",
 					"pathName": "pages/groupPage/collage-details/collage-details",
 					"query": "orderId=1542621051065701"
-=======
-					"name": "replydetails",
-					"pathName": "pages/social/replyDetail/replyDetail",
-					"query": ""
->>>>>>> limengbo
 				}
 			]
 		}