From 2596418c94076093f4ef73ebcea3d1d8ecd3e310 Mon Sep 17 00:00:00 2001
From: AlineRinquin <aline.rinquin.ar@gmail.com>
Date: Fri, 18 Feb 2022 10:59:57 +0100
Subject: [PATCH] fix conflicts

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

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 8de0573..d1960bf 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -39,7 +39,6 @@ import { PageHumeurComponent } from './pages/page-humeur/page-humeur.component';
 import { FooterComponent } from './components/footer/footer.component';
 import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component';
 import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component';
-import { EmoticonComponent } from './emoticon/emoticon.component';
 
 
 
@@ -80,7 +79,6 @@ import { EmoticonComponent } from './emoticon/emoticon.component';
     FooterComponent,
     PageDeleteAccountComponent,
     PageUpdateAccountComponent,
-    EmoticonComponent,
   ],
   imports: [
     BrowserModule,
@@ -88,7 +86,7 @@ import { EmoticonComponent } from './emoticon/emoticon.component';
     ReactiveFormsModule,
     HttpClientModule,
     FormsModule,
-    // AutofocusFixModule.forRoot(),
+    AutofocusFixModule.forRoot(),
   ],
   providers: [