合并

DAPlatform-front/src/router/index.js

 import Vue from 'vue'
 import Router from 'vue-router'
-<<<<<<< HEAD
-import HelloWorld from '@/components/HelloWorld'
-import test1 from '@/components/test1'
-=======
 import Login from '../components/Login'
 import userhome from '../components/UserHome'
 import TaskHall from '../components/Taskhall'
@@ -21,7 +17,6 @@ import SelectedText from '../components/textAnnotation/SelectedText'
 import Table from '../components/textAnnotation/Table'
 import imageAnnotiation from '../components/imageAnnotation/imageAnnotiation'
 import layerAnnotation from '../components/imageAnnotation/layerAnnotation'
->>>>>>> 1bbb2e17abc83db9f556796abf7cad13a94852ad
 
 Vue.use(Router)
 
@@ -117,18 +112,8 @@ export default new Router({
     },
     {
       path: '/',
-<<<<<<< HEAD
-      name: 'HelloWorld',
-      component: HelloWorld
-    },
-    {
-      path: '/test1',
-      name: 'test1',
-      component: test1
-=======
       name: 'login',
       component: Login
->>>>>>> 1bbb2e17abc83db9f556796abf7cad13a94852ad
     }
   ]
 })