Revert "merge conflict"

This reverts commit 37797d5f7d.
merge conflict
2026-05-18 20:57:27 +02:00 · 2026-05-18 18:06:56 +02:00 · 2026-05-17 22:23:23 +02:00 · 2026-05-17 22:21:36 +02:00 · 2026-05-17 20:22:01 +02:00 · 2026-05-17 20:18:15 +02:00
4 changed files with 4 additions and 14 deletions
--- a/Assets/Scenes/Minigame-KeyInsert.unity.meta
+++ b/Assets/Scenes/Minigame-KeyInsert.unity.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a9886d0962880e14fb8072fee41dc9b5
+guid: 22ca1d6a0bb686a409e5f1fc1164b686
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Debris/TrashDebrisUnityPackage.unitypackage.meta
+++ b/Debris/TrashDebrisUnityPackage.unitypackage.meta
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 5d7070679a02c0f478502a9eac088352
+guid: 50c3453b214b4c24487f630d82fff48b
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -7,7 +7,6 @@
    "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",
    "com.unity.modules.accessibility": "1.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -122,16 +122,6 @@
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "3.2.2",
-      "depth": 0,
-    "com.unity.sysroot": {
-      "version": "2.0.10",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
    "com.unity.sysroot.linux-x86_64": {
      "version": "2.0.9",
      "depth": 1,
@@ -224,7 +214,7 @@
      "dependencies": {
        "com.unity.modules.androidjni": "1.0.0",
        "com.unity.nuget.newtonsoft-json": "3.2.1",
-        "com.unity.modules.unitywebrequest": "1.0.0"
+        "com.unity.modules.unitywebrequest": "1.0.0",
        "com.unity.sysroot": "2.0.10"
      },
      "url": "https://packages.unity.com"
Author	SHA1	Message	Date
krylj	e776b9476e	Revert "merge conflict" This reverts commit `37797d5f7d`.	2026-05-18 20:57:27 +02:00
krylj	37797d5f7d	merge conflict psl co tam mám změnit?	2026-05-18 18:06:56 +02:00
Trubkokrtek	fed08d08ad	Merge pull request 'Package patch' (#23 ) from Pajka into main Reviewed-on: #23	2026-05-17 22:23:23 +02:00
trubkokrtek	843c121666	Package patch	2026-05-17 22:21:36 +02:00
trubkokrtek	dfec8df767	Revert "Merge pull request 'find-the-sweet-spot' (#13 ) from find-the-sweet-spot into main" This reverts commit `5b8e4eaeac`, reversing changes made to `03c0b158a4`.	2026-05-17 20:22:01 +02:00
Trubkokrtek	5b8e4eaeac	Merge pull request 'find-the-sweet-spot' (#13 ) from find-the-sweet-spot into main Reviewed-on: #13 Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>	2026-05-17 20:18:15 +02:00
trubkokrtek	9571be257c	resolved conflict	2026-05-17 20:17:21 +02:00
Trubkokrtek	03c0b158a4	Merge pull request 'KeyInsertMinigame' (#16 ) from KeyInsertMinigame into main Reviewed-on: #16 Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>	2026-05-17 20:16:23 +02:00
trubkokrtek	8bec2f0cf8	conflict resolve	2026-05-17 12:32:20 +02:00
gravitrax-bublina	9a99405f4b	Ignore .utmp temp folder	2026-05-17 12:15:46 +02:00
gravitrax-bublina	b4b746de25	Remove .utmp temp files from PR	2026-05-17 12:14:53 +02:00
gravitrax-bublina	dd5aefcb49	Update Eda minigame scene and project settings	2026-05-17 10:03:13 +02:00
gravitrax-bublina	c11ca05ea8	nejlepsi minihra, velmi dobre funguje, nepouzil jsem chatbota nai jednoud a vsechno jsem programoval pomoci libraries a moc me to bavilo, esing neni nejaky skvely ale funguje to na iphone, takze se to mozna rozbije pokud to zkusite runnout na androidu	2026-03-28 10:18:32 +01:00