diff --git a/.gitattributes b/.gitattributes index f664d5c..0777e76 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,9 +13,13 @@ *.ttf filter=lfs diff=lfs merge=lfs -text *.otf filter=lfs diff=lfs merge=lfs -text *.unitypackage filter=lfs diff=lfs merge=lfs -text - # Настройка Smart Merge для текстовых файлов Unity (сцены, префабы) *.unity merge=unityyamlmerge eol=lf *.prefab merge=unityyamlmerge eol=lf *.asset merge=unityyamlmerge eol=lf *.meta merge=unityyamlmerge eol=lf +*.mkv filter=lfs diff=lfs merge=lfs -text +*.mp4 filter=lfs diff=lfs merge=lfs -text +*.mov filter=lfs diff=lfs merge=lfs -text +*.avi filter=lfs diff=lfs merge=lfs -text +Assets/Art/Videoclips/Menu[[:space:]]Videoclip.mov filter=lfs diff=lfs merge=lfs -text diff --git a/Assets/Art/Videoclips/Menu Videoclip.mov b/Assets/Art/Videoclips/Menu Videoclip.mov index 566bd41..3520933 100644 Binary files a/Assets/Art/Videoclips/Menu Videoclip.mov and b/Assets/Art/Videoclips/Menu Videoclip.mov differ