PBA3H25ABU/ClearTheZone
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone

Browse Source 
# Conflicts:
#	Assets/Scenes/Story1.unity
#	Assets/Scripts/Bullet.cs
#	Assets/Scripts/EnemyHealth.cs
#	Assets/Scripts/Shoot.cs
This commit is contained in:
PBA3H25ABU
2026-08-20 11:44:27 +02:00
parent 89d2a8a758
commit 94d5f82635
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Story1.unity.rej
+11
View File
@@ -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: