dianyang
/
colmo-h5
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

.

李志伟 3 years ago
parent
f81734864e
commit
c4ddd82f35
1 changed files with 2 additions and 5 deletions
Unified View Show Diff Stats
  1. 2
    5
      src/router/index.js

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

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