From e36dd2959d8e0874b7c27d06f03bcc182380764b Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Fri, 4 Jan 2019 17:53:03 +0100 Subject: [PATCH] Material files also need to be in .gitattributes --- src/GitHub.Api/Resources/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GitHub.Api/Resources/.gitattributes b/src/GitHub.Api/Resources/.gitattributes index bc6b99a79..da4c9970c 100644 --- a/src/GitHub.Api/Resources/.gitattributes +++ b/src/GitHub.Api/Resources/.gitattributes @@ -5,6 +5,7 @@ *.unity -text merge=unityyamlmerge diff *.asset -text merge=unityyamlmerge diff *.prefab -text merge=unityyamlmerge diff +*.mat -text merge=unityyamlmerge diff # Image formats *.psd filter=lfs diff=lfs merge=lfs -text