diff --git a/frontend/src/components/ShopByBrand.jsx b/frontend/src/components/ShopByBrand.jsx index 15bd902..3e861f3 100644 --- a/frontend/src/components/ShopByBrand.jsx +++ b/frontend/src/components/ShopByBrand.jsx @@ -151,11 +151,81 @@ const ShopByBrand = () => { ))} +<<<<<<< HEAD + + + + +
+ + + + + + + + + + + +
+ + ); +======= ))} ); +>>>>>>> main }; export default ShopByBrand;