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

Merge pull request #55 from AlineRinquin/aline

Browse source 
resolve conflicts
This commit is contained in:
AlineRinquin 2022-02-25 17:17:05 +01:00 • committed by GitHub
commit 0e4e0f18dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/app/app.module.ts
View file

@ -43,6 +43,7 @@ import localeFr from '@angular/common/locales/fr';
import { CardAvatarComponent } from './components/card-avatar/card-avatar.component';
import { HumeurComponent } from './components/humeur/humeur.component';
import { DeconnexionComponent } from './components/deconnexion/deconnexion.component';
import { HumeurComponent } from './components/humeur/humeur.component';
registerLocaleData(localeFr)
@NgModule({

1
src/app/pages/page-dashboard/page-dashboard.component.html
View file

@ -1,6 +1,7 @@
<app-header></app-header>
<app-side-bar></app-side-bar>
<app-deconnexion></app-deconnexion>
<div class="container">