solving conflict from merging main to matt branch

juliusbrehme · Oct 22, 2023 · 1edf21d · 1edf21d
1 parent d75f587
commit 1edf21d
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/Frontend/algoverse/src/App.js b/Frontend/algoverse/src/App.js
@@ -6,22 +6,16 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 
 function App() {
   return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.js</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
-    </div>
+    <>
+      <Router>
+        <SearchBar />
+        <Routes>
+          <Route path="/" exact Component={Home} />
+          <Route path="/home" exact Component={Home} />
+        </Routes>
+        <SideBar />
+      </Router>
+    </>
   );
 }