conflict fix in sections.jsx

advanced-computer-lab-2023 · Nov 11, 2023 · 52283d0 · 52283d0
1 parent 59e1d3f
commit 52283d0
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/client/src/routes/sections.jsx b/client/src/routes/sections.jsx
@@ -49,14 +49,7 @@ export default function Router() {
     },
     {
       path: '*',
-<<<<<<< HEAD
-      element: <Navigate to="/404" replace />,
-    }, {
-      path: 'up',
-      element: <UploadFile url='http://localhost:3000/upload/patient/medicalHistory' />
-=======
       element: <Navigate to="/404" replace />
->>>>>>> main
     }
   ]);