Skip to content

J
jiedao-app-operator-master
Commit c0604e3b authored by 我在何方's avatar 我在何方
Browse files
Options

解决冲突

parent 6a1c1cb3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
src/router/index.js
View file @ c0604e3b
...@@ -283,8 +283,6 @@ export const constantRoutes = [ ...@@ -283,8 +283,6 @@ export const constantRoutes = [
}, },
] ]
}, },
<<<<<<< HEAD
=======
{ {
path: '/boxSea', path: '/boxSea',
component: Layout, component: Layout,
...@@ -314,7 +312,6 @@ export const constantRoutes = [ ...@@ -314,7 +312,6 @@ export const constantRoutes = [
} }
] ]
}, },
>>>>>>> ad637e33746d81b425acb8e13903cb24f27ecd6e
] ]
// 防止连续点击多次路由报错 // 防止连续点击多次路由报错
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment