rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP conflits sorted out

Browse source
This commit is contained in:
NigeParis 2025-12-18 20:26:00 +01:00
parent 0d5b30388f
commit d9cc54ade9
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/chat/src/chat_types.ts
View file

@ -32,7 +32,6 @@ export type ClientProfil = {
innerHtml?: string, innerHtml?: string,
}; };
<<<<<<< HEAD
export type obj = export type obj =
@ -49,5 +48,3 @@ export type obj =
SenderWindowID: string, SenderWindowID: string,
Sendertext: string, Sendertext: string,
}; };
=======
>>>>>>> refs/remotes/origin/nigel/functionBlockMessage