o

1ab424b0 · Gakki · 0c335410 · 1ab424b0
Commit 1ab424b0 authored Dec 04, 2020 by Gakki
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

.gitattributes .gitattributes +4 -4

No files found.
--- a/.gitattributes
+++ b/.gitattributes
-/dist/**/* merge=ours
+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
+src/server/api.js merge=ours
+src/router/* merge=ours
+src/views/home.vue merge=ours
\ No newline at end of file