From 94d5f8263574c07998c7507e39be5583eb3ac201 Mon Sep 17 00:00:00 2001
From: "NBTEMP\\bib" <Oliver.Budnick@edu.bib.de>
Date: Thu, 20 Aug 2026 11:44:27 +0200
Subject: [PATCH] Merge branch 'main' of
 https://git.bib.de/PBA3H25ABU/ClearTheZone

# Conflicts:
#	Assets/Scenes/Story1.unity
#	Assets/Scripts/Bullet.cs
#	Assets/Scripts/EnemyHealth.cs
#	Assets/Scripts/Shoot.cs
---
 Assets/Scenes/Story1.unity.rej | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 Assets/Scenes/Story1.unity.rej

diff --git a/Assets/Scenes/Story1.unity.rej b/Assets/Scenes/Story1.unity.rej
new file mode 100644
index 0000000..841672d
--- /dev/null
+++ b/Assets/Scenes/Story1.unity.rej
@@ -0,0 +1,11 @@
+diff a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity	(rejected hunks)
+@@ -2210,6 +2210,9 @@
+   rescueDistance: 3
+   escapeDistance: 15
+   runSpeed: 5
++<<<<<<< HEAD
++>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
++=======
+ >>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
+ --- !u!1660057539 &9223372036854775807
+ SceneRoots: