From d168270d108e5909c56f565a25eb704d61fa432e Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 5 Dec 2018 16:02:32 +0530
Subject: [PATCH] merge : ps

---
 ng6-seed/src/app/dashboard/dashboard.component.html         | 6 ++----
 .../start-pd/forms/other-income/other-income.component.html | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html
index 6875a9489..4ea5cdf2d 100755
--- a/ng6-seed/src/app/dashboard/dashboard.component.html
+++ b/ng6-seed/src/app/dashboard/dashboard.component.html
@@ -80,11 +80,9 @@
                                         <div *ngIf="total3 != 0" class="donut-inner"><span>Tele - {{total3}}</span></div>
                                 </div>
                         </div>
-<<<<<<< HEAD
+
                         <div fxLayout="row" class="pt-3">
-=======
-                        <div fxLayout="row" class="pt-3" *ngIf="total3 != 0 && total2 != 0 && total1 != 0">
->>>>>>> c62d273c7a10f4df22b027dc9664dc37e83c93fa
+
                                 <div fxFlex.gt-sm="100" fxFlex="100" style="text-align:center">
                                 <ul class="lengend-list">
                                 <li class="lengend-element"><span class="oval" style="background-color:#c1c1c1"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&nbsp; Draft</li>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index 3211059a7..71651f88f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -296,7 +296,7 @@
                                             <mat-option value="agricultural_income">Agricultural Income</mat-option>
                                             <mat-option value="dividend_income">Dividend Income</mat-option>
                                             <mat-option value="others">Others</mat-option> -->
-                                        </mat-select>
+                                        <!-- </mat-select>
                                     </mat-form-field>
                                     <mat-form-field *ngIf="details.get('source').value == 5 ">     
                                         <input matInput placeholder="Specify Others Source"
@@ -309,7 +309,7 @@
                                     <mat-form-field>
                                             <mat-select placeholder="Frequency" formControlName="frequency" required>
                                                 <mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
-                                            </mat-select>
+                                            </mat-select> --
                                     </mat-form-field>-->
                                     
                                     <!-- {{otherIncomeForm.controls.frequency.value}} -->