Revert "Merge pull request 'find-the-sweet-spot' (#13) from find-the-sweet-spot into main"
This reverts commit5b8e4eaeac, reversing changes made to03c0b158a4.
This commit is contained in:
@@ -1,10 +1,5 @@
|
||||
{
|
||||
"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",
|
||||
@@ -15,7 +10,6 @@
|
||||
"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",
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
"dependencies": {
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"com.unity.2d.sprite": {
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
@@ -109,7 +107,6 @@
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
>>>>>>> origin/main
|
||||
"com.unity.multiplayer.center": {
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
@@ -118,16 +115,6 @@
|
||||
"com.unity.modules.uielements": "1.0.0"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"com.unity.textmeshpro": {
|
||||
"version": "5.0.0",
|
||||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.ugui": "2.0.0"
|
||||
}
|
||||
},
|
||||
=======
|
||||
"com.unity.nuget.newtonsoft-json": {
|
||||
"version": "3.2.2",
|
||||
"depth": 0,
|
||||
@@ -271,7 +258,6 @@
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
>>>>>>> origin/main
|
||||
"com.unity.ugui": {
|
||||
"version": "2.0.0",
|
||||
"depth": 0,
|
||||
|
||||
Reference in New Issue
Block a user