# Added this line to .gitattributes
*.pbxproj -crlf -diff -merge
