index

src/router/index.js

@@ -340,8 +340,7 @@ export const constantRoutes = [
       }
     ]
   },
-<<<<<<< HEAD
-=======
+
   {
     path: '/online-quality',
     component: Layout,
@@ -377,8 +376,6 @@ export const constantRoutes = [
       }
     ]
   },
-  { path: '*', redirect: '/404', hidden: true }
->>>>>>> c5c499f579a12a3665be9836b9d78f6e321c7d69
 
   { path: '*', redirect: '/404', hidden: true },