Merge "Resolve the merge conflict"

1 files changed, 2 insertions, 6 deletions

diff --git a/alarm-analysis/src/main/webapp/alarm/app/app.module.ts b/alarm-analysis/src/main/webapp/alarm/app/app.module.ts
index 5c1d6533..fd557717 100644
--- a/alarm-analysis/src/main/webapp/alarm/app/app.module.ts
+++ b/alarm-analysis/src/main/webapp/alarm/app/app.module.ts
@@ -25,7 +25,6 @@ import {HttpModule,Jsonp}   from  '@angular/http';
 import {AlarmRuleService} from './correlation-ruleList/alarmRule.service';

 import {TranslateModule} from "ng2-translate";

 import {SifModalComponent} from './correlation-modal/modal.component'

-import {TestBed,ComponentFixture} from '@angular/core/testing';

 @NgModule({

     imports: [

         BrowserModule,

@@ -39,12 +38,9 @@ import {TestBed,ComponentFixture} from '@angular/core/testing';
         AppComponent,

         AlarmRule,

         RuleInfo,

-        SifModalComponent,

-        TestBed,

-        ComponentFixture

+        SifModalComponent

     ],

     providers:[ModalService,AlarmRuleService,Jsonp],

     bootstrap: [AppComponent]

 })

-export class AppModule { }

-

+export class AppModule { }
\ No newline at end of file