From 8b5c9461d577657160ae0210918008851c4e002d Mon Sep 17 00:00:00 2001 From: MuhammadKhalilzadeh Date: Mon, 22 Jul 2024 22:55:23 +0330 Subject: [PATCH] fixing conflicts --- Client/src/App.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 4d0b7a7ae..4bb99022f 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -18,8 +18,9 @@ import NewPasswordConfirmed from "./Pages/Auth/NewPasswordConfirmed"; import ProtectedRoute from "./Components/ProtectedRoute"; import Details from "./Pages/Monitors/Details"; import Maintenance from "./Pages/Maintenance"; -import "react-toastify/dist/ReactToastify.css"; -import { ToastContainer } from "react-toastify"; +import withAdminCheck from "./HOC/withAdminCheck"; +import Configure from "./Pages/Monitors/Configure"; + import ErrorPage from "./Pages/Errors"; function App() {