ลบโค้ตเกินทิ้ง

src/app/pages/equipment/equipment.component.html

@@ -11,7 +11,6 @@
         </div>
     </div>
 
-<<<<<<< HEAD
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
             <a class="nav-link active" id="ยืมอุปกรณ์IT-tab" data-toggle="tab" href="#ยืมอุปกรณ์IT" role="tab"
@@ -65,48 +64,6 @@
                                     <img src="assets\img\mo1.jpg" class="nav justify-content-center" alt="...">
                                 </div>
                             </div>
-=======
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="card">
-                <div class="card-body">
-                    <ng-template #content let-modal>
-                        <div class="modal-header">
-                          <h4 class="modal-title" id="modal-basic-title">Add Equipment</h4>
-                          <button type="button" class="close" aria-label="Close" (click)="modal.dismiss('Cross click')">
-                            <span aria-hidden="true">&times;</span>
-                          </button>
-                        </div>
-                        <div class="modal-body">
-                          <form>
-                            <div class="form-group">
-                              <label for="addequip">Add Equipment</label>
-                              <div class="input-group">
-                                <input id="addequip" class="form-control" placeholder="yyyy-mm-dd" name="dp" ngbDatepicker #dp="ngbDatepicker">
-                                <div class="input-group-append">
-                                  <button class="btn btn-outline-secondary calendar" (click)="dp.toggle()" type="button"></button>
-                                </div>
-                              </div>
-                            </div>
-                          </form>
-                        </div>
-                        <div class="modal-footer">
-                          <button type="button" class="btn btn-outline-dark" (click)="modal.close('Save click')">Save</button>
-                        </div>
-                      </ng-template>
-                      
-                      <button class="btn btn-lg btn-outline-primary" (click)="open(content)">Add Equipment</button>
-                      
-                      <hr>
-                      
-                      <pre>{{ closeResult }}</pre>
-                    <div ngbDropdown class="d-inline-block">
-                        <button class="btn btn-outline-primary" id="dropdownBasic1" ngbDropdownToggle>หมวดหมู่</button>
-                        <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                            <button ngbDropdownItem>ยืมอุปกรณ์</button>
-                            <button ngbDropdownItem>ยืมรถ</button>
-                            <button ngbDropdownItem>จองห้อง</button>
->>>>>>> 3b736bfa2d20b31eaab4ac1723a6613c44690579
                         </div>
                         
                         <div class="d-flex justify-content-between p-2">