dist/**/* merge=ours
Dockerfile merge=ours
src/server/api.js merge=ours
src/router/* merge=ours
src/views/home.vue merge=ours