From f6735b90cfd2cec815bd2adfddfdc3233f5444a7 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Thu, 15 Nov 2018 15:45:27 +0530
Subject: [PATCH] merge chnages : kdk

---
 .../forms/employment-info/employment-info.component.html | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
index b2affd34d..182110f24 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
@@ -23,7 +23,6 @@
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
-<<<<<<< HEAD
     <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'">
         <mat-form-field>
             <input matInput placeholder="Name of person met" formControlName="name_person_met">
@@ -32,11 +31,6 @@
             <input matInput placeholder="Designation of person met" formControlName="designation_person_met">
         </mat-form-field>
     </div>
-=======
-    <mat-form-field *ngIf="employmentForm.controls['was_met'].value == 'yes'">
-        <input matInput placeholder="Name and designation of person met" formControlName="name_designation">
-    </mat-form-field>
->>>>>>> 5c030410fe6ccc3b23a783988e739a66e93bf0ea
     <mat-form-field>
         <mat-select placeholder="Salary amount confirmed ?"
                     formControlName="confirm_salary">
@@ -71,13 +65,10 @@
             </mat-form-field>
 
             <mat-form-field>
-<<<<<<< HEAD
                 <input matInput placeholder="Net Monthly Salary"
                        formControlName="net_monthly_salary">
-=======
                 <input matInput placeholder="Net Take Home"
                        formControlName="net_take_home">
->>>>>>> 5c030410fe6ccc3b23a783988e739a66e93bf0ea
             </mat-form-field>
             <mat-form-field>
                 <input matInput placeholder="Bonus or Incentive"