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>

1 files changed, 2 insertions, 1 deletions

diff --git a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.spec.ts b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.spec.ts
index 76aaa3e7..066d73ff 100644
--- a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.spec.ts
+++ b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.spec.ts
@@ -43,6 +43,7 @@ import { NgMaterialModule } from 'src/app/ng-material-module';
 import { Component } from '@angular/core';
 import { ElipsisPipe } from 'src/app/shared/pipes/elipsis/elipsis.pipe';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { HttpClientTestingModule} from '@angular/common/http/testing';
 
 describe('TabbarComponent', () => {
   let component: TabbarComponent;
@@ -51,7 +52,7 @@ describe('TabbarComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ TabbarComponent, AppSideBarStubComponent, AppUserBarStubComponent,RouterOutletStubComponent,AppFooterBarStubComponent,ElipsisPipe],
-      imports: [NgMaterialModule,BrowserAnimationsModule]
+      imports: [NgMaterialModule,BrowserAnimationsModule,HttpClientTestingModule]
     })
     .compileComponents();
   }));