解决冲突

c0604e3b · 我在何方 · 6a1c1cb3 · c0604e3b
Commit c0604e3b authored Jul 15, 2022 by 我在何方
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

index.js src/router/index.js +0 -3

No files found.
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -283,8 +283,6 @@ export const constantRoutes = [
      },
    ]
  },
-<<<<<<< HEAD
-=======
  {
    path: '/boxSea',
    component: Layout,
@@ -314,7 +312,6 @@ export const constantRoutes = [
      }
    ]
  },
->>>>>>> ad637e33746d81b425acb8e13903cb24f27ecd6e
 ]

 // 防止连续点击多次路由报错