Conflicts: index.html src/api/user.js src/routes.js src/views/Home.vue src/views/nav1/Log.vue src/views/nav1/perm.vue src/views/nav1/role.vue src/views/nav1/user.vue