Skip to content

Commit

Permalink
fix: resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
marshjaja committed Oct 6, 2024
1 parent a1d33f1 commit 60ffafc
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -68,6 +70,7 @@ export function App() {
}
/>
</Route>
</Route>
<Route element={<Login user={user} />} path="/login" />
</Routes>
</Router>
Expand Down

0 comments on commit 60ffafc

Please sign in to comment.