From a8f54fb1612e747ac8af33bbfddb0c13a64d5f7b Mon Sep 17 00:00:00 2001
From: Mahimatestgithub <guptamahima7848@gmail.com>
Date: Tue, 29 Oct 2024 13:59:09 +0530
Subject: [PATCH] done

---
 src/App.jsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 1f83ca68..ecac6994 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -157,13 +157,8 @@ export default function App() {
           {/* Other user routes */}
           <Route path="contributors" element={<Contributors />} />
           <Route path="about-us" element={<AboutUs />} />
-<<<<<<< HEAD
           <Route path="help" element={<Help />} /> {/* Help page route */}
           <Route path="privacy-policy" element={<Privacy />} />
-=======
-          <Route path="help" element={<Help />} />
-          <Route path="privacy" element={<Privacy />} />
->>>>>>> 5eed12d9 (revert sadaf commit for category changes)
           {/* Privacy policy page route */}
           <Route path="cart" element={<Cart />} /> 
           <Route