vincentRamiere/simpleat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge dev into Romain

Browse source
This commit is contained in:
Romain Verger 2022-03-02 16:56:14 +01:00
parent 6c9aa254e8
commit 4a271c15b7
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/app/pages/favoris-user/favoris-user.component.ts
View file

@ -14,11 +14,6 @@ export class FavorisUserComponent implements OnInit {
listRestoFav: any;
constructor(private apiBackService : ApiBackService,private tokenService : TokenService) {
<<<<<<< HEAD
=======
constructor(private apiBackService : ApiBackService,private tokenService : TokenService) {
>>>>>>> dev
}
ngOnInit(): void {
@ -38,3 +33,4 @@ export class FavorisUserComponent implements OnInit {
}
}