Danimoth/gitattributes — pull request #6 by adamtait (2014-02-09 19:02:12+00:00)
Title: add ObjectiveC.gitattributes

it's annoying to manually merge .xbproj files. this fixes it.