conflict resolved

This commit is contained in:
2026-05-24 11:28:32 +02:00
904 changed files with 345656 additions and 972 deletions

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 4c92126c07bfe7e4f8eea9bf78d8f29f
VideoClipImporter:
externalObjects: {}
serializedVersion: 3
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant: