添加merge规则

cdd2128e · Gakki · cc42d065 · cdd2128e
Commit cdd2128e authored Dec 04, 2020 by Gakki
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

.gitattributes .gitattributes +5 -0

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+dist/**/* merge=ours
+Dockerfile merge=ours
+src/server/api.js merge=ours
+src/router/* merge=ours
+src/views/home.vue merge=ours
\ No newline at end of file