From 0964afff41ff186eb0bb2bd679a34513e90d1015 Mon Sep 17 00:00:00 2001 From: jz385p Date: Tue, 7 Jul 2020 19:24:27 +0530 Subject: Audit log,resolved merge conflict Audit log code merge conflict resolved Issue-ID: PORTAL-941 Change-Id: I1dbe87cee9b471aa0b7319bd8a568826de927c8b Signed-off-by: jz385p --- .../src/app/layout/components/tabbar/tabbar.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html') diff --git a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html index 93dd3450..8d3d876e 100644 --- a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html +++ b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html @@ -38,7 +38,7 @@
+ (selectedTabChange)="tabChanged($event);auditLog($event)" >