diff --git a/.gitattributes b/.gitattributes index 5503089..f4ed7ca 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -*.pbxproj -crlf -diff -merge *.strings diff