.

Author: RiyaaChauhan

index.html

@@ -14,8 +14,6 @@
     <div class="bar">
         <a href="#home"><img src="./footer/assets/logo.jpeg" alt="logo"></a>
 
-<<<<<<< HEAD
-
         <div class="header-content">
             <div class="auth-cart">
                 <a href="#" class="cart-icon">
@@ -28,7 +26,6 @@
 
 
         <a href="./html/signin.html">sign in</a>
-=======
         <div class="right-side">
              <a href="./html/signin.html">sign in</a>
 
@@ -39,7 +36,6 @@
 
         </div>
 
->>>>>>> fbf9a73a411204bb296018d09315b06187271666
     </div>
     <div class="banner">
         <div class="box">
@@ -122,11 +118,8 @@ <h4>Visit Pizza Hut</h4>
             </div>
         </div>
     </footer>
-<<<<<<< HEAD
-    <script src="./js/first.js"></script>
-=======
 
->>>>>>> fbf9a73a411204bb296018d09315b06187271666
+    <script src="./js/first.js"></script>
     <script src="./js/location.js"></script>
 
 </body>