Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
# Conflicts: # Assets/Scenes/Story1.unity # Assets/Scenes/Story1.unity.rej # Assets/Scripts/Bullet.cs # Assets/Scripts/EnemyHealth.cs # Assets/Scripts/Shoot.cs
This commit is contained in:
@@ -1,3 +1,7 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
//Oliver
|
||||
>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
|
||||
using UnityEngine;
|
||||
|
||||
public class EnemyHealth : MonoBehaviour
|
||||
|
||||
Reference in New Issue
Block a user