Merge pull request #974 from github-for-unity/unty-yaml-merge

Fixing UnityYamlMerge

Author: Andreia Gaita

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