From 027d45057917b87a0d5932d877bc49f22a2e92fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Sun, 17 Sep 2023 20:10:53 +0200 Subject: [PATCH] Forgot a merge conflict --- front/models/User.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/front/models/User.ts b/front/models/User.ts index 6f63543..e4bc5a1 100644 --- a/front/models/User.ts +++ b/front/models/User.ts @@ -7,12 +7,8 @@ export const UserValidator = yup .object({ username: yup.string().required(), password: yup.string().required().nullable(), -<<<<<<< HEAD - email: yup.string().required(), emailVerified: yup.boolean().required(), -======= email: yup.string().required().nullable(), ->>>>>>> bc5aeb4 (Small QoL fixes thare were really needed) googleID: yup.string().required().nullable(), isGuest: yup.boolean().required(), partyPlayed: yup.number().required(),