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

resolve conflicts

Browse source
This commit is contained in:
AlineRinquin 2022-02-25 17:14:58 +01:00
parent a04bef6954
commit b885324f1f
3 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<app-header></app-header>
<app-side-bar></app-side-bar>
<app-humeur></app-humeur>
<app-deconnexion></app-deconnexion>
@ -19,14 +19,7 @@
<div class="row">
<div class="col-sm-3 col-xs-6 box border" id="boxFour">
<div>
<p>Humeur en attente component
</p>
<p>Humeur en attente component
</p>
<p>Humeur en attente component
</p>
</div>
<app-humeur></app-humeur>
</div>
</div>