isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40 from AlineRinquin/aline

Browse Source 
fix conflicts
This commit is contained in:
AlineRinquin 2022-02-18 11:00:41 +01:00 committed by GitHub
commit 3644b8f1bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.module.ts
View File

@ -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: [