Revert "Reapply "fix1.2""

This reverts commit dea33b7613.
2026-08-20 11:38:49 +02:00
parent dea33b7613
commit a3ead4845c
3 changed files with 0 additions and 17 deletions
@@ -33,9 +33,6 @@ 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")