update

src/router/index.js

@@ -517,7 +517,6 @@ const routes = [
 		]
 	},
 
-<<<<<<< HEAD
   // 综合搜索
   {
     path: "/comprehensiveSearch",
@@ -561,7 +560,6 @@ const routes = [
       title: "合作限制详情"
     }
   },
-=======
 	// 出口管制转移过来的页面
 	{
 		path: "/exportControl/analysis",
@@ -659,7 +657,6 @@ const routes = [
 			title: "搜索结果"
 		}
 	}
->>>>>>> 2f544ed599fb9b8301b84e796781b13dc3dbde0d
 ];
 
 const router = createRouter({