From e5e6163f4d1e096daed4aa4699905afcc715a0c7 Mon Sep 17 00:00:00 2001 From: Guillaume Cauchois Date: Wed, 27 Nov 2024 16:09:57 +0100 Subject: [PATCH] fix: merge conflict --- src/mails/mails.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mails/mails.service.ts b/src/mails/mails.service.ts index 7b321471..d91915a5 100644 --- a/src/mails/mails.service.ts +++ b/src/mails/mails.service.ts @@ -79,7 +79,9 @@ export class MailsService { }); } - async sendWelcomeMail(user: User) { + async sendWelcomeMail( + user: Pick + ) { const { candidatesAdminMail } = getAdminMailsFromZone(user.zone); if (user.role === UserRoles.COACH) {