Resolve a part of merge conflicts

2019-11-22 10:18:09 +01:00 · 2019-11-22 10:18:09 +01:00 · 275a065d8e
parent 39d4213bde
commit 275a065d8e
1 changed files with 1 additions and 0 deletions
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -38,6 +38,7 @@ import {
    TranslateService
 } from '@ngx-translate/core';
 import {TranslateHttpLoader} from '@ngx-translate/http-loader';
+
 import { AdminComponent } from './pages/admin/admin.component';

 export class MyMissingTranslationHandler implements MissingTranslationHandler {