update

index.html

@@ -13,25 +13,7 @@
     <div class="row justify-content-center">
       <div class="col-md-6">
         <h2 class="mb-4">Регистрация</h2>
-<<<<<<< HEAD
         <div class="form-container"></div>
-=======
-<<<<<<< HEAD
-        <form id="registrationForm">
-          <div class="form-group">
-            <label for="inputName">Name</label>
-            <input type="text" class="form-control" id="inputName" placeholder="Введите ваше имя" name="name" required>
-          </div>
-          <div class="form-group">
-            <label for="inputEmail">Email</label>
-            <input type="text" class="form-control" id="inputEmail" placeholder="Введите email" name="email" required>
-          </div>
-          <input type="submit" value="Submit" class="btn btn-primary" disabled>
-        </form>
-=======
-        <div class="form-container"></div>
->>>>>>> 02f9cff (delete branch)
->>>>>>> 789e718492fae34f8d9104375cf3422e5e96aee7
       </div>
     </div>
   </div>