# Conflicts: # src/app/app-routing.module.ts # src/app/pages/compte/profil/profil.page.html # src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.html # src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.ts # src/app/pages/menu/menu.module.ts # src/app/pages/offres/dashboard/dashboard.page.scss
