try to fix

2026-06-06 02:48:23 +02:00
parent bdfc3eec0b
commit 6f76a4c04f
1 changed files with 0 additions and 4 deletions
@@ -137,10 +137,6 @@ public class DropletMovement : MonoBehaviour
        }

        //enable collider --> not a trigger anymore
-<<<<<<< HEAD
-        rb.useGravity = true;
-        playerCollider.isTrigger = false;
-=======
        rb.gravityScale = 1;
        playerCollider.isTrigger = false;
        isDropping = false;