1 files changed, 1 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8e45d03
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj merge=union