Revert "Merging"

This reverts commit b180875539.
This commit is contained in:
DerTyp187
2021-12-16 22:03:10 +01:00
parent b180875539
commit 151f63c9fb
54 changed files with 6 additions and 8378 deletions

View File

@@ -10,12 +10,7 @@
"com.unity.render-pipelines.universal": "12.1.2",
"com.unity.test-framework": "1.1.29",
"com.unity.textmeshpro": "3.0.6",
<<<<<<< HEAD
"com.unity.timeline": "1.6.3",
=======
"com.unity.timeline": "1.6.2",
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
>>>>>>> parent of 131d40d (Revert "Merge branch 'Lobby-System'")
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.7.6",
"com.unity.modules.ai": "1.0.0",