From 6ff5fe2a364ad62ca3c5ef3c05c54e0b6dd9ea8a Mon Sep 17 00:00:00 2001
From: MuhammadKhalilzadeh <muhammadkhalilzadeh1998@gmail.com>
Date: Tue, 23 Jul 2024 00:12:49 +0330
Subject: [PATCH] fixing conflicts

---
 Client/src/App.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Client/src/App.jsx b/Client/src/App.jsx
index 2015793d7..0482aec5d 100644
--- a/Client/src/App.jsx
+++ b/Client/src/App.jsx
@@ -81,8 +81,7 @@ function App() {
         <Route exact path="/login" element={<Login />} />
         <Route exact path="/register" element={<Register />} />
         {/* <Route path="/toast" element={<ToastComponent />} /> */}
-        {/* <Route path="*" element={<NotFound />} /> */}
-        <Route path="/not-found" element={<NotFound />} />
+        <Route path="*" element={<NotFound />} />
         <Route path="/forgot-password" element={<ForgotPassword />} />
         <Route path="/check-email" element={<CheckEmail />} />
         <Route path="/set-new-password/:token" element={<SetNewPassword />} />