From d9010d186f322d9a75cf12faa0cf126b035a6fb1 Mon Sep 17 00:00:00 2001
From: dak180 <dak180@users.sourceforge.net>
Date: Fri, 3 Feb 2012 18:06:06 -0500
Subject: [PATCH] Hopefully make it so conflicts in the xcode project files are
 automatically resolved.

This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
---
 .gitattributes | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 6097a7042..086373619 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
-*.pbxproj -crlf -merge
-*.xcworkspacedata -crlf -merge
-*.xcscheme -crlf -merge
+*.pbxproj -crlf merge=ours
+*.xcworkspacedata -crlf merge=ours
+*.xcscheme -crlf merge=ours