added merge rules for pbxproj files

cpmpercussion · Jun 22, 2017 · 9d050bd · 9d050bd
1 parent 937523a
commit 9d050bd
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj binary merge=union