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

resolved conflict

Browse Source
This commit is contained in:
trubkokrtek
2026-05-17 20:17:21 +02:00
parent 8bec2f0cf8 03c0b158a4
commit 9571be257c
840 changed files with 341756 additions and 4771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Settings/PC_Renderer.asset.meta
View File

@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 1fe0ebf7f09ec7e4fa76e81c31b87dde
=======
guid: 838b2b6371a376844b3213d982530ce0
>>>>>>> origin/main
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0