From baffc32ac8cf46b5d021e562213b9ffb87a1a7a4 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Fri, 27 May 2016 17:35:03 -0700 Subject: [PATCH] update .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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