From 60ffafcf45fc8b8dfad5d291ddff3046ac1a8306 Mon Sep 17 00:00:00 2001
From: marshjaja <114920895+marshjaja@users.noreply.github.com>
Date: Sun, 6 Oct 2024 12:58:42 +0100
Subject: [PATCH] fix: resolve merge conflict

---
 src/App.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/App.jsx b/src/App.jsx
index c93d9df..dbcdfe9 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -59,7 +59,9 @@ export function App() {
 						/>
 						<Route
 							path="/list"
-							element={<List data={data} listPath={listPath} listName={listName} />}
+							element={
+								<List data={data} listPath={listPath} listName={listName} />
+							}
 						/>
 						<Route
 							path="/manage-list"
@@ -68,6 +70,7 @@ export function App() {
 							}
 						/>
 					</Route>
+				</Route>
 				<Route element={<Login user={user} />} path="/login" />
 			</Routes>
 		</Router>