rapair code

Author: eSKej

FormsAndButtons.html

@@ -20,11 +20,7 @@
             <div class="collapse navbar-collapse" id="navbarMenu">
                   <ul class="navbar-nav">
                         <li class="nav-item">
-<<<<<<< HEAD
                               <a href="FormsAndButtons.html" class="nav-link">Form &amp; Buttons</a>
-=======
-                              <a href="FormsAndButtons.html" class="nav-link">Alert & Modal</a>
->>>>>>> e56b0428a60e6cb27dcf6e0d0d81de0b0f288051
                         </li>
                         <li class="nav-item">
                               <a href="#" class="nav-link">...</a>
@@ -48,12 +44,6 @@
                         <div class="form-group">
                               <label for="lastname">Lastname</label>
                               <input type="text" name="lastname" id="lastname" class="form-control" required>
-<<<<<<< HEAD
-=======
-                              <small class="form-text text-muted">
-                                    This should be your last name
-                              </small>
->>>>>>> e56b0428a60e6cb27dcf6e0d0d81de0b0f288051
                         </div>
                   </div>
             </div>

index.html

@@ -20,11 +20,7 @@
             <div class="collapse navbar-collapse" id="navbarMenu">
                   <ul class="navbar-nav">
                         <li class="nav-item">
-<<<<<<< HEAD
                               <a href="FormsAndButtons.html" class="nav-link">Form &amp; Buttons</a>
-=======
-                              <a href="FormsAndButtons.html" class="nav-link">Alert & Modal</a>
->>>>>>> e56b0428a60e6cb27dcf6e0d0d81de0b0f288051
                         </li>
                         <li class="nav-item">
                               <a href="#" class="nav-link">...</a>