From fd1ec359d2652d041944293f111c6645053f92de Mon Sep 17 00:00:00 2001 From: NigeParis Date: Thu, 18 Dec 2025 20:20:40 +0100 Subject: [PATCH] Merge conflicts --- src/chat/src/app.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chat/src/app.ts b/src/chat/src/app.ts index 75aebf2..f40f88e 100644 --- a/src/chat/src/app.ts +++ b/src/chat/src/app.ts @@ -384,11 +384,11 @@ async function onReady(fastify: FastifyInstance) { const UserToBlock: User | null = getUserByName(users, `${profilBlock.user}`); const UserAskingToBlock: User | null = getUserByName(users, `${profilBlock.SenderName}`); - console.log(color.yellow, `user to block: ${profilBlock.user}`); - console.log(color.yellow, UserToBlock); - console.log(color.yellow, `user Asking to block: ${profilBlock.SenderName}`); - console.log(color.yellow, UserAskingToBlock); - console.log(color.red, clientName); + // console.log(color.yellow, `user to block: ${profilBlock.user}`); + // console.log(color.yellow, UserToBlock); + // console.log(color.yellow, `user Asking to block: ${profilBlock.SenderName}`); + // console.log(color.yellow, UserAskingToBlock); + // console.log(color.red, clientName); if (!UserAskingToBlock || !UserToBlock) return;