diff --git a/.gitattributes b/.gitattributes index bf4a41e..e1692b7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,13 +1,10 @@ # Set the default behavior, in case people don't have core.autocrlf set. * text=auto - ## Unity ## - *.txt text *.cs diff=csharp text *.cginc text *.shader text - *.mat merge=unityyamlmerge eol=lf *.anim merge=unityyamlmerge eol=lf *.unity merge=unityyamlmerge eol=lf @@ -19,9 +16,9 @@ *.meta merge=unityyamlmerge eol=lf *.controller merge=unityyamlmerge eol=lf *.flare merge=unityyamlmerge eol=lf - #3D Object *.FBX -text *.fbx -text *.blend -text -*.obj -text \ No newline at end of file +*.obj -text +*.dll filter=lfs diff=lfs merge=lfs -text