done

codervivek5 · Oct 29, 2024 · a8f54fb · a8f54fb
1 parent 349fc6b
commit a8f54fb
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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