Resolve a part of merge conflicts

This commit is contained in:
Le Libre Au Quotidien 2019-11-22 10:18:09 +01:00
parent 39d4213bde
commit 275a065d8e

View File

@ -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 {