Merge branch 'main' into dev

MAVRICK-1 · May 15, 2024 · 9f35e7e · 9f35e7e
2 parents a9a3023 + a94d623
commit 9f35e7e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/App.js b/src/App.js
@@ -18,7 +18,6 @@ import Listing from "./pages/Listing";
 import NotFound from "./pages/NotFound";
 import SignIn from "./pages/SignIn";
 import SignUp from "./pages/SignUp";
-
 import ResetPassword from "./pages/ResetPassword";
 import Cart from "./pages/cart";
 import Wishlist from "./pages/wishList";
@@ -295,3 +294,4 @@ function App() {
 export default App;
 
 export { MyContext };
+
diff --git a/src/pages/About/about.css b/src/pages/About/about.css
@@ -196,4 +196,4 @@
     width: 120px;
     height: 120px;
   }
-}
+}
diff --git a/src/pages/About/index.js b/src/pages/About/index.js
@@ -75,4 +75,4 @@ function Tes() {
   );
 }
 
-export default Tes;
+export default Tes;
-Original file line number
+Diff line change
@@ Expand Up / @@ -196,4 +196,4 @@ @@
         width: 120px;
         height: 120px;
       }
-    }
+    }