From 40759c3658dd87bb2529b1d0753fcc9a89a4c46a Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 5 Feb 2022 16:34:07 +0530
Subject: [PATCH] conflict changes

---
 .../manage-pd/list-pd/view-pd/view-pd.component.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 9e2bd52..8ff4c2c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -209,7 +209,7 @@
                                         {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status==pdStatusCheck.ALLOCATED_TO_FIA ?'Allocated to vendor':master.pd_status | titlecase}} 
                                 </div>
                                 <div *ngIf="is_agency_logged_in == true" [attr.fxFlex]='(currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA) ? "40" : "20"' align="left" style="color: #e00201">
-                                  {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}} 
+                                  {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status==pdStatusCheck.ALLOCATED_TO_FIA ?'Allocated to vendor':master.pd_status | titlecase}}  
                                   <br>
                                   <p style="color:blue;font-size: small;">{{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.vendor_status | titlecase}}</p>
                                  </div>