From 754f8b734c308cf6652bea8989edc027872826b7 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Nov 2018 15:22:08 -0500 Subject: [PATCH] Fixing attributes --- src/GitHub.Api/Resources/.gitattributes | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GitHub.Api/Resources/.gitattributes b/src/GitHub.Api/Resources/.gitattributes index 7782ad6fe..bc6b99a79 100644 --- a/src/GitHub.Api/Resources/.gitattributes +++ b/src/GitHub.Api/Resources/.gitattributes @@ -1,10 +1,10 @@ * text=auto # Unity files -*.meta -text merge=unityamlmerge diff -*.unity -text merge=unityamlmerge diff -*.asset -text merge=unityamlmerge diff -*.prefab -text merge=unityamlmerge diff +*.meta -text merge=unityyamlmerge diff +*.unity -text merge=unityyamlmerge diff +*.asset -text merge=unityyamlmerge diff +*.prefab -text merge=unityyamlmerge diff # Image formats *.psd filter=lfs diff=lfs merge=lfs -text