合并

src/components/SideBar.vue

@@ -6,12 +6,9 @@
     </div>
     <el-menu mode="vertical" :show-timeout="200" :router="true" background-color="#00142a" text-color="hsla(0, 0%, 100%, .65)" active-text-color="#409EFF">
       <el-menu-item index="/404">404</el-menu-item>
-<<<<<<< HEAD
       <el-menu-item index="/user">User</el-menu-item>
-=======
       <el-menu-item index="/views/certificate/index">凭证管理</el-menu-item>
       <el-menu-item index="/account/register">账号管理</el-menu-item>
->>>>>>> 03554cf84ff0c10f54dbfe84a7de1d30ea0129b8
     </el-menu>
   </scroll-bar>
 </template>

src/router.js

@@ -23,11 +23,9 @@ export default new Router({
           component: () => import('./views/NotFound.vue'),
         },
         {
-<<<<<<< HEAD
           path: '/user',
           name: 'User',
           component: () => import('./views/UserMes/userMes.vue'),
-=======
           path: '/views/certificate/index',
           name: 'certificate',
           component: () => import('./views/certificate/index.vue'),
@@ -36,7 +34,6 @@ export default new Router({
           path: '/account/register',
           name: 'register',
           component: () => import('./views/account/register.vue'),
->>>>>>> 03554cf84ff0c10f54dbfe84a7de1d30ea0129b8
         },
       ],
     },