add .gitattributes

dalehenrich · Jan 31, 2015 · 5990191 · 5990191
1 parent 821ddc7
commit 5990191
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/repository/.gitattributes b/repository/.gitattributes
@@ -0,0 +1,3 @@
+*.package/monticello.meta/version        merge=mcVersion
+*.package/*.class/methodProperties.json      merge=mcMethodProperties
+