END UPDET

Author: Taha-M-Fawy

Home/ProductDetails.html

@@ -61,19 +61,13 @@
                         <form class="d-flex" role="search">
 
                             <div class="ico">
-<<<<<<< HEAD
                                 <a href="../Cartpage/index.html"><i class="fa-solid fa-cart-shopping"></i></a>
-=======
-<<<<<<<< HEAD:Home/index.html
                                 <a href="../Cart/cart.html"><i class="fa-solid fa-cart-shopping" style="color:#db4444"></i></a>
                             </div>
 
                             <div class="person">
-                                <a href="../editProfilePage/EditProfilePage.html"><img src="../image/MR.png"></a>                                <p id="login-message"></p>
-========
+                                <a href="../editProfilePage/EditProfilePage.html"><img src="../image/MR.png"></a> <p id="login-message"></p>
                                 <a href="../Cartpage/index.html"><i class="fa-solid fa-cart-shopping"></i></a>
->>>>>>>> 2d10ccabab84602c0884b388f280663fdc130c34:Home/ProductDetails.html
->>>>>>> 2d10ccabab84602c0884b388f280663fdc130c34
                             </div>
                         </form>
                         <div class="person">
@@ -125,20 +119,12 @@ <h5>Support</h5>
                 <div class="box">
                     <h5>Account</h5>
                     <div class="Account-us">
-<<<<<<< HEAD
                         <a href="sd">Erorr404</a>
                         <a href="../editProfilePage/EditProfilePage.html">My Account</a>
                         <a href="../login/login.htm" style="display: inline-block;">Login</a> / <a href="../create acount/create.htm"  style="display: inline-block;">Register</a>
                         <a href="../Cart/cart.html">Cart</a>
                         <a href="../contact_ page/contact.html">Contact</a>
                         <a href="../about/about.html">About</a>
-=======
-                        <a href="../editProfilePage/EditProfilePage.html">My Account</a>
-                        <a href="../login/login.htm" style="display: inline-block;">Login</a> / <a href="../create acount/create.htm"  style="display: inline-block;">Register</a>
-                        <a href="">Cart</a>
-                        <a href="">Wishlist</a>
-                        <a href="">Shop</a>
->>>>>>> 2d10ccabab84602c0884b388f280663fdc130c34
                     </div>
                 </div>
                 <div class="box">