Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
warzone2100/.gitattributes

4 lines
90 B
Plaintext
Raw Permalink Normal View History

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).
2012-02-03 15:06:06 -08:00
*.pbxproj -crlf merge=ours
*.xcworkspacedata -crlf merge=ours
*.xcscheme -crlf merge=ours