# Conflicts: # src/router/index.js # src/views/admin/user/index.vue
# Conflicts: # src/router/index.js