conflict resolved

This commit is contained in:
2026-06-04 21:48:23 +02:00
1368 changed files with 332599 additions and 9614 deletions

View File

@@ -0,0 +1,13 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Materials/Magenta.mat.meta
guid: f5b74b605e2aedd42a9e4e8a40046cf5
NativeFormatImporter:
========
guid: 070c4a89027b6e9a28e16859d55f8c66
DefaultImporter:
>>>>>>>> origin/main:Assets/Scenes/MiniGame-Satelit.unity.meta
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant: