Make project file diffs/merges happen properly. D'oh.

naleon · Dec 26, 2012 · 2070a5e · 2070a5e
1 parent 25ecf53
commit 2070a5e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1 @@
-*.pbxproj -crlf -diff -merge
 *.strings diff