merge conflict

src/app/app.component.spec.ts

@@ -1,9 +1,7 @@
 import { TestBed, async } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
-import { ElectronService } from './providers/electron.service';
-
-import { TranslateService, TranslateModule } from '@ngx-translate/core';
+import { ElectronService } from 'app/providers/electron.service';
 
 describe('AppComponent', () => {
   beforeEach(async(() => {
@@ -12,12 +10,12 @@ describe('AppComponent', () => {
         AppComponent
       ],
       providers: [
-        ElectronService,
-        { provide: TranslateService, useClass: TranslateServiceStub }
+        ElectronService
       ],
-      imports: [RouterTestingModule,
-      TranslateModule.forRoot()
-    ]
+      imports: [
+        RouterTestingModule,
+        TranslateModule.forRoot()
+      ]
     }).compileComponents();
   }));