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/Green.mat.meta
guid: 0fb69fc17dec90a41803db19eb400738
NativeFormatImporter:
========
guid: a8455b5835249e44d931c30790f60381
DefaultImporter:
>>>>>>>> origin/main:Assets/Scenes/Lobby.unity.meta
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant: