Browse Source

Make .gz files merge properly

Yentl Van Tendeloo 4 years ago
parent
commit
b3d374390d
1 changed files with 1 additions and 1 deletions
  1. 1 1
      .gitattributes

+ 1 - 1
.gitattributes

@@ -1 +1 @@
-*.m binary
+*.gz merge=keepTheir