fixing garbage data

2024-02-21 16:59:09 +01:00 · 2024-02-21 16:59:09 +01:00 · 0e5ff11e83
commit 0e5ff11e83
parent f2910f0620
1 changed files with 0 additions and 4 deletions
--- a/frontend/static/js/api/game/Segment.js
+++ b/frontend/static/js/api/game/Segment.js
@ -1,9 +1,5 @@
-<<<<<<< HEAD
 import { Point } from "./Point.js";
-=======
-import { Point } from "./Point.js"
 import { renderCube } from "../../3D/cube.js"
->>>>>>> de2488589cf0a579b849e706b40901c355ff35f8

 class Segment
 {