diff --git a/.gitattributes b/.gitattributes index 80edb3f0c4..bb4f779361 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ CHANGELOG.md merge=union - +*.mm linguist-language=Objective-C