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: