From 9dd12a55bf11b52cc7a4ea86c47790ae06713ee8 Mon Sep 17 00:00:00 2001
From: Daniel Bross <daniel@brossferatu.com>
Date: Sat, 12 Jul 2025 01:10:53 +0200
Subject: [PATCH] Merged

---
 module.jai | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/module.jai b/module.jai
index e0b098a..5744dc6 100644
--- a/module.jai
+++ b/module.jai
@@ -157,11 +157,6 @@ coven_run :: (game_update_proc: (float), game_editor_update_proc: (float), game_
 
             if engine.current_scene != null && !engine.paused {
                 update_animators(clamped_dt);
-<<<<<<< HEAD
-=======
-                update_mesh_colliders(engine.current_scene);
-                update_physics(engine.current_scene, clamped_dt);
->>>>>>> 5f61c0491241b1f62266e0d521c2e315b2c5b8e3
 
                 pre_physx_sync(engine.current_scene);
                 tick_physx(*engine.current_scene.physx_scene, clamped_dt);