Always keep our generated files to avoid conflicts.

Dallinger · Aug 16, 2023 · b935f25 · b935f25
1 parent 5563570
commit b935f25
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dlgr/griduniverse/static/scripts/dist/.gitattributes b/dlgr/griduniverse/static/scripts/dist/.gitattributes
@@ -1,4 +1,4 @@
-*.js -diff -merge
+*.js -diff merge=ours
 *.js linguist-generated=true
-*.map -diff -merge
+*.map -diff merge=ours
 *.map linguist-generated=true