Skip to content

Commit

Permalink
Changed gitattributes on pbxproj to prevent merging but not diffing
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewfb
andrewfb committed Jun 11, 2011
1 parent 1c84a7c commit 2df3625
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Xcode
*.pbxproj -crlf -diff -merge
*.pbxproj -crlf -merge

# Visual Studio
*.vcproj -crlf -diff
Expand Down

0 comments on commit 2df3625

Please sign in to comment.