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

fighting git conflicts

Browse source
This commit is contained in:
apetitco 2025-12-19 15:04:20 +01:00
parent 53a2c06d43
commit e36d41a7c4
10 changed files with 692 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/@shared/package.json
View file

@ -20,8 +20,12 @@
"fastify-plugin": "^5.1.0",
"joi": "^18.0.2",
"otp": "^1.1.2",
<<<<<<< HEAD
<<<<<<< HEAD
"typebox": "^1.0.64",
=======
"typebox": "^1.0.63",
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
=======
"typebox": "^1.0.63",
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)