Add .gitattributes (for cases where we do want to merge projects with less hassle)

This commit is contained in:
Alex Harker
2019-08-24 11:42:17 +01:00
parent 81455412a2
commit 83bf340492
+1
View File
@@ -0,0 +1 @@
*.pbxproj merge=union