fix1.2

2026-08-20 11:35:35 +02:00
parent 1db2ec9a94
commit c35a879034
3 changed files with 17 additions and 0 deletions
@@ -33,6 +33,9 @@ public class Bullet : MonoBehaviour
                Destroy(gameObject);
            }

+<<<<<<< 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)
        }
        else if(collision.gameObject.tag == "Wall")