解决冲突

pages.json

@@ -580,18 +580,13 @@
 				"path":"personal/myrecruitstick"//我的招募贴
 			},{
 				"path":"richText"//富文本编辑页面
-<<<<<<< HEAD
 			},{
                 "path":"message"//消息
             },{
-                "path":"visitor"//访客
-            }
-            ]
-=======
+                "path":"visitor"//访客
 			},{
 				"path":"personal/mydate"//我的约会
-			}]
->>>>>>> 905d1c7b161914cd80dd0125e60e7e1d88d2b3bf
+			}]
 		},
 		//韩国馆项目
		{
			"root": "pages/kotra",
			"pages": [{
				"path": "contanctus"
			},{
				"path": "contanctDetail"
			},{
				"path": "compInformation"
			},{
 				"path": "activeInner"

pages/index/index.vue

@@ -1133,12 +1133,9 @@
 			
 			yj(){
 				uni.navigateTo({
-<<<<<<< HEAD
 					// url: '/pages/blindDate/message' 
 					url: '/pages/blindDate/visitor' 
-=======
-					url: '/pages/blindDate/personal/mydate' 
->>>>>>> 905d1c7b161914cd80dd0125e60e7e1d88d2b3bf
+
 				})
 			}
 		},