Add .gitattributes

Attempt to handle .pbxproj merge conflicts by including both sides of the changes.
appsquickly · Nov 13, 2013 · 650301d · 650301d
1 parent 2d070db
commit 650301d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj binary merge=union