mirror of
https://framagit.org/framasoft/framadate/funky-framadate-front.git
synced 2023-08-25 13:53:14 +02:00
Resolve a part of merge conflicts
This commit is contained in:
parent
39d4213bde
commit
275a065d8e
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user