Audit log,resolved merge conflict 07/109907/3
authorjz385p <jegadeesh.babu@att.com>
Tue, 7 Jul 2020 13:54:27 +0000 (19:24 +0530)
committerJegadeesh Babu <jegadeesh.babu@att.com>
Tue, 7 Jul 2020 14:22:26 +0000 (14:22 +0000)
commit0964afff41ff186eb0bb2bd679a34513e90d1015
tree0d7cc194bac01540da23a5983e87a99a9162b4aa
parentdc35cacae0c16b16985effa1459cf96d646811ff
Audit log,resolved merge conflict

Audit log code merge conflict resolved

Issue-ID: PORTAL-941
Change-Id: I1dbe87cee9b471aa0b7319bd8a568826de927c8b
Signed-off-by: jz385p <jegadeesh.babu@att.com>
portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
portal-FE-common/src/app/layout/components/tabbar/tabbar.component.spec.ts
portal-FE-common/src/app/layout/components/tabbar/tabbar.component.ts
portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.html
portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts
portal-FE-common/src/app/shared/services/auditLog/audit-log.service.spec.ts [new file with mode: 0644]
portal-FE-common/src/app/shared/services/auditLog/audit-log.service.ts [new file with mode: 0644]