From 2f63a13fb8fbf5dc94eb37f58368c92262aa513d Mon Sep 17 00:00:00 2001 From: M M Date: Tue, 9 Jul 2024 17:32:24 -0700 Subject: [PATCH] Fixed conflicts. --- Client/src/App.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Client/src/App.jsx b/Client/src/App.jsx index fd2f62eda..a6581ad81 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -18,11 +18,9 @@ import CheckEmail from "./Pages/CheckEmail"; import SetNewPassword from "./Pages/SetNewPassword"; import NewPasswordConfirmed from "./Pages/NewPasswordConfirmed"; import ProtectedRoute from "./Components/ProtectedRoute"; -<<<<<<< HEAD import Details from "./Pages/Details"; -======= import Maintenance from "./Pages/Maintenance"; ->>>>>>> upstream/master + function App() { return (