diff --git a/.gitattributes b/.gitattributes index 983658214..4712d86eb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ *.strings diff=localizablestrings -*.pbxproj binary merge=union