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

13
Packages/manifest.json
View File

@@ -1,8 +1,21 @@
{
"dependencies": {
<<<<<<< HEAD
"com.unity.textmeshpro": "4.0.0",
"com.unity.ugui": "2.0.0",
"com.unity.multiplayer.center": "1.0.0",
=======
"com.unity.2d.sprite": "1.0.0",
"com.unity.ide.visualstudio": "2.0.27",
"com.unity.inputsystem": "1.14.2",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.2.2",
"com.unity.remote-config": "4.2.5",
"com.unity.render-pipelines.universal": "17.2.0",
"com.unity.nuget.newtonsoft-json": "3.2.2",
"com.unity.toolchain.linux-x86_64": "2.0.11",
"com.unity.ugui": "2.0.0",
>>>>>>> origin/main
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",