# Conflicts: # App.vue # manifest.json # pages.json # pages/gather/gather.vue # pages/index/index.vue # pages/user/index.vue # pages/users/login/login_copy.vue
# Conflicts: # App.vue # manifest.json # pages.json # pages/gather/gather.vue # pages/index/index.vue # pages/user/index.vue # pages/users/login/login_copy.vue