BlueCabinetGames/GeoSusGame
8
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolved

Browse Source
This commit is contained in:
trubkokrtek
2026-06-04 21:48:23 +02:00
parent c6a328194c c78bdc2b2a
commit 5664097fb2
1368 changed files with 332599 additions and 9614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Assets/Materials.meta
View File

@@ -1,8 +1,32 @@
fileFormatVersion: 2
<<<<<<< HEAD
<<<<<<<< HEAD:Assets/Materials.meta
guid: 744e54cd6d3cca64fb2cc6df4ba2e8db
========
<<<<<<< HEAD
guid: d8c6f31643437cf4fa0e66ec2ff9a2e2
=======
guid: c5ada28132037dc49b25799cd085863a
>>>>>>> origin/main
>>>>>>>> origin/main:Assets/TutorialInfo/Icons.meta
=======
<<<<<<< HEAD
guid: 6cf6ace151aa0204c9a7cb5e00164105
=======
guid: 6b37670de43269e4f984694475e75510
>>>>>>> origin/main
>>>>>>> origin/main
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
<<<<<<< HEAD
assetBundleVariant:
=======
<<<<<<< HEAD
assetBundleVariant:
=======
assetBundleVariant:
>>>>>>> origin/main
>>>>>>> origin/main