Moves prefabs out of LFS so yamlmerge can do merges

sneakaway-studio · Oct 15, 2020 · e228c5b · e228c5b
1 parent b1e4a2d
commit e228c5b
Show file tree

Hide file tree

Showing 10 changed files with 54,119 additions and 28 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,7 +5,7 @@
 *.tga filter=lfs diff=lfs merge=lfs -text
 *.mp3 filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
-*.prefab filter=lfs diff=lfs merge=lfs -text
+*.prefab merge=unityyamlmerge eol=lf
 *.fbx filter=lfs diff=lfs merge=lfs -text
 *.xcf filter=lfs diff=lfs merge=lfs -text
 *.app filter=lfs diff=lfs merge=lfs -text