merged login page

src/components/authentication/TheLogin.vue

@@ -10,11 +10,7 @@
         <div class="row">
           <div
             class="col-md-2 d-flex flex-column justify-content-center align-items-left"
-<<<<<<< HEAD
             style="margin-right: -65px"
-=======
-            style="margin-right: -120px"
->>>>>>> 7d4eb5a (init)
           >
             <img class="logo-img1" src="img/e-Rahn_Logo_FA-01.png" alt="erahn-logo" />
           </div>
@@ -109,7 +105,6 @@
               iconPos="right"
             ></Button>
           </div>
-<<<<<<< HEAD
           <div class="flex alin justify-content-center mt-4 text-hover">
             <div class="btn btn-warning btn-sm">
               <terms-and-conditions></terms-and-conditions>
@@ -117,12 +112,6 @@
             <!-- <a class="btn btn-info btn-sm" href="https://lelong.arrahn.com.my"
               >Pautan Sistem Lelong</a
             > -->
-=======
-          <div class="flex alin justify-content-center mt-4">
-            <div class="btn btn-warning btn-sm mr-4">
-              <terms-and-conditions></terms-and-conditions>
-            </div>
->>>>>>> 7d4eb5a (init)
           </div>
         </div>
       </form>