Skip to content

Commit e228c5b

Browse files
committed
Moves prefabs out of LFS so yamlmerge can do merges
1 parent b1e4a2d commit e228c5b

File tree

10 files changed

+54119
-28
lines changed

10 files changed

+54119
-28
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*.tga filter=lfs diff=lfs merge=lfs -text
66
*.mp3 filter=lfs diff=lfs merge=lfs -text
77
*.wav filter=lfs diff=lfs merge=lfs -text
8-
*.prefab filter=lfs diff=lfs merge=lfs -text
8+
*.prefab merge=unityyamlmerge eol=lf
99
*.fbx filter=lfs diff=lfs merge=lfs -text
1010
*.xcf filter=lfs diff=lfs merge=lfs -text
1111
*.app filter=lfs diff=lfs merge=lfs -text

0 commit comments

Comments
 (0)