git

src/router/index.js

@@ -1,13 +1,9 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-<<<<<<< HEAD
-import HelloWorld from '@/components/HelloWorld'
-import SignUp from '@/components/signup'
-=======
 import ColmoIndex from '@/pages'
 import AllPages from '@/pages/AllPages'
 import Test from '@/pages/Test'
->>>>>>> 2c609bec11ebd93370c950ce842904c31d6c2e0d
+import SignUp from '@/components/signup'
 
 Vue.use(Router)