fix：解决冲突

2024-12-18 17:43:07 +08:00
parent 587c7a85fa
commit 18ba2e86eb
1 changed files with 7 additions and 20 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,18 +7,6 @@ const router = createRouter({
      name: 'home',
      component: () => import('@/views/home/index.vue')
    },
-<<<<<<< HEAD
-    {
-      path: '/monitor',
-      name: 'monitor',
-      component: () => import('../views/monitor/index.vue')
-    },
-    {
-      path: '/testing',
-      name: 'testing',
-      component: () => import('../views/testing/index.vue')
-    },
-=======
    {
      path: '/monitor',
      name: 'monitor',
@@ -34,7 +22,6 @@ const router = createRouter({
      name: 'roadTesting',
      component: () => import('../views/testing/road.vue')
    },
->>>>>>> 5f31856ac0b5635af49bbc759a9121742cbe2f23
    {
      path: '/scenic',
      name: 'scenic',