Baozhangchao 3 years ago
parent
commit
07a56ff9fd
1 changed files with 1 additions and 5 deletions
  1. 1
    5
      src/router/index.js

+ 1
- 5
src/router/index.js View File

@@ -1,13 +1,9 @@
1 1
 import Vue from 'vue'
2 2
 import Router from 'vue-router'
3
-<<<<<<< HEAD
4
-import HelloWorld from '@/components/HelloWorld'
5
-import SignUp from '@/components/signup'
6
-=======
7 3
 import ColmoIndex from '@/pages'
8 4
 import AllPages from '@/pages/AllPages'
9 5
 import Test from '@/pages/Test'
10
->>>>>>> 2c609bec11ebd93370c950ce842904c31d6c2e0d
6
+import SignUp from '@/components/signup'
11 7
 
12 8
 Vue.use(Router)
13 9