fixing merge conflicts

2024-02-21 16:43:44 +01:00
parent c7cd9202f4 de2488589c
commit a85827ce08
12 changed files with 457 additions and 17 deletions
--- a/frontend/static/js/api/game/Wall.js
+++ b/frontend/static/js/api/game/Wall.js
@ -14,8 +14,8 @@ class Wall
    }

    draw(ctx)
-    {
-        this.rail.draw(ctx);
+	{
+		this.rail.draw(ctx);
    }

    from_json(data)
@ -26,4 +26,4 @@ class Wall
    }
 }

-export { Wall };
+export { Wall };