fix merge conflict

HemanthGowda · Jun 12, 2021 · cc3d4db · cc3d4db
1 parent ab7d166
commit cc3d4db
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/App.js b/src/App.js
@@ -17,16 +17,13 @@ function App() {
 					<Route path="/join">
 						<Join/>
 					</Route>
-<<<<<<< HEAD
-=======
 
 					{/* If none of the previous routes render anything,
                         this route acts as a fallback.
 
                         Important: A route with path="/" will *always* match
                         the URL because all URLs begin with a /. So that's
                         why we put this one last of all */}
->>>>>>> d983f8316a4f16cf23be41bd6830c938adafa2c1
 					<Route path="/">
 						<Home/>
 					</Route>