merge branch dev into show-connected-robots pt2

2025-10-30 14:57:50 +01:00
parent 32938edca8
commit 6a88aa3d75
3 changed files with 0 additions and 141 deletions
--- a/src/pages/VisProgPage/VisProg.tsx
+++ b/src/pages/VisProgPage/VisProg.tsx
@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-import VisProgUI from "../../visualProgrammingUI/VisProgUI.tsx";
-
-function VisProgPage() {
-    return (
-        <>
-            <VisProgUI />
-        </>
-    )
-=======
 import {
  Background,
  Controls,
@@ -144,7 +134,6 @@ function VisProgPage() {
      <VisualProgrammingUI/>
    </>
  )
->>>>>>> origin/dev
 }

 export default VisProgPage