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,12 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Materials/Blue.mat.meta
guid: 151c2d5ead486e14f84805c05457ef7f
========
guid: 0ac383cb888b6814d8432e6ec14f49cd
>>>>>>>> origin/main:Assets/Materials/image.mat.meta
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant: