diff --git a/Swift.gitattributes b/Swift.gitattributes index 84c8a81..f9db223 100644 --- a/Swift.gitattributes +++ b/Swift.gitattributes @@ -1,2 +1,3 @@ +# Swift gitattributes *.pbxproj merge=union *.swift text diff=swift