From 275a065d8ebde70d9556ad1c2e915daf6228578b Mon Sep 17 00:00:00 2001
From: Le Libre Au Quotidien <louisdupont72@yahoo.com>
Date: Fri, 22 Nov 2019 10:18:09 +0100
Subject: [PATCH] Resolve a part of merge conflicts

---
 src/app/app.module.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 880016e4..33f0f37a 100644
--- 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 {