From 4557e3bfd86ef8f99d8b5a71ccbc73e8194d12e9 Mon Sep 17 00:00:00 2001
From: go38coz <go38coz@mytum.de>
Date: Sat, 6 Jun 2026 01:10:06 +0200
Subject: [PATCH] test

---
 Game/Assets/Scripts/DamageHandler.cs      | 17 +++++++++++++++++
 Game/Assets/Scripts/DamageHandler.cs.meta |  2 ++
 Game/Assets/Scripts/DropletMovement.cs    |  3 ---
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 Game/Assets/Scripts/DamageHandler.cs
 create mode 100644 Game/Assets/Scripts/DamageHandler.cs.meta

diff --git a/Game/Assets/Scripts/DamageHandler.cs b/Game/Assets/Scripts/DamageHandler.cs
new file mode 100644
index 0000000..ffef791
--- /dev/null
+++ b/Game/Assets/Scripts/DamageHandler.cs
@@ -0,0 +1,17 @@
+using UnityEngine;
+
+public class DamageHandler : MonoBehaviour
+{
+	public 
+    // Start is called once before the first execution of Update after the MonoBehaviour is created
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
diff --git a/Game/Assets/Scripts/DamageHandler.cs.meta b/Game/Assets/Scripts/DamageHandler.cs.meta
new file mode 100644
index 0000000..05cc573
--- /dev/null
+++ b/Game/Assets/Scripts/DamageHandler.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2b3b9fc97a2d39d2d84c4be43a79247a
\ No newline at end of file
diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs
index a6f314a..9336849 100644
--- a/Game/Assets/Scripts/DropletMovement.cs
+++ b/Game/Assets/Scripts/DropletMovement.cs
@@ -3,14 +3,11 @@ using UnityEngine;
 public class DropletMovement : MonoBehaviour
 {
     private Rigidbody2D rb;
-<<<<<<< HEAD
-=======
     public float moveSpeed = 5f;
     public float jumpingPower = 5f;
     private Vector2 movement;
     private Animator playerAnim; //for animation
     private float xInput;
->>>>>>> 3a4d5de (current correct code inshallah)
 
     public float moveSpeed = 5f;
     public float jumpingPower = 5f;