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

fix conflicts

Browse source
This commit is contained in:
AlineRinquin 2022-02-18 10:59:57 +01:00
parent 056576b87f
commit 2596418c94
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 { FooterComponent } from './components/footer/footer.component';
import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component'; import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component';
import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-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, FooterComponent,
PageDeleteAccountComponent, PageDeleteAccountComponent,
PageUpdateAccountComponent, PageUpdateAccountComponent,
EmoticonComponent,
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
@ -88,7 +86,7 @@ import { EmoticonComponent } from './emoticon/emoticon.component';
ReactiveFormsModule, ReactiveFormsModule,
HttpClientModule, HttpClientModule,
FormsModule, FormsModule,
// AutofocusFixModule.forRoot(), AutofocusFixModule.forRoot(),
], ],
providers: [ providers: [