From 2b6a1ebdf3c3a434cfc20202c689018f71bfae87 Mon Sep 17 00:00:00 2001
From: go38coz <go38coz@mytum.de>
Date: Sat, 6 Jun 2026 02:47:20 +0200
Subject: [PATCH] try to fix

---
 Game/Assets/Scripts/DropletMovement.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs
index ce18e9b..c251bb1 100644
--- a/Game/Assets/Scripts/DropletMovement.cs
+++ b/Game/Assets/Scripts/DropletMovement.cs
@@ -128,12 +128,8 @@ public class DropletMovement : MonoBehaviour
 
         while (elapsed < duration)
         {
-<<<<<<< HEAD
-            rb.useGravity = false;
-=======
             isDropping = true;
             rb.gravityScale = 0;
->>>>>>> origin/main
             transform.Translate(Vector3.down * speed * Time.deltaTime);
             elapsed += Time.deltaTime; //update time
             yield return null;