Update index.html

full-stack-web-developer-and-designer · full-stack-web-developer-and-designer · commit b6d38e4e31fc · 2022-01-15T20:10:10.000+01:00
diff --git a/index.html b/index.html
@@ -35,7 +35,6 @@
 	});
 });
         </script>
-<<<<<<< HEAD
          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" integrity="sha384-+d0P83n9kaQMCwj8F4RJB66tzIwOKmrdb46+porD/OvrJ+37WqIM7UoBtwHO6Nlg" crossorigin="anonymous">
         <style>
         main {
@@ -51,8 +50,6 @@
         }
         #footer {
             background-color: #808080;
-            /* position: absolute;
-            bottom: 0;*/
             width: 100%;
             }
         .footer-social {
@@ -72,9 +69,6 @@
             background-color: #FFF;
         }
         </style>
-=======
-        <style>main{width: 70%;margin: 100px auto;padding: 1px 50px 50px;background-color:#AAA;}h1{color:#FFF;text-align:center;}input{margin: 0 15px 0 0;}</style>
->>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107
     </head>
     <body>
     <main>
@@ -88,8 +82,7 @@ <h1>Make your reservation in the time!</h1>
             <option value="2">2 Seat</option>
         </select> 
         <input type="submit" value="Search">
-    </main>
-<<<<<<< HEAD
+    </main><!-- end main -->
     <div id="footer">
         <section class="footer-social">
           <a href="https://www.facebook.com/mirnes.glamocic.5/" target="_blank">
@@ -105,7 +98,5 @@ <h1>Make your reservation in the time!</h1>
           </a>
         </section>
       </div><!-- end #footer -->
-=======
->>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107
 </body>
 </html>
