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

5
src/tic-tac-toe/package.json
View file

@ -15,6 +15,7 @@
"license": "ISC",
"packageManager": "pnpm@10.24.0",
"dependencies": {
<<<<<<< HEAD
"@fastify/autoload": "^6.3.1",
"@fastify/formbody": "^8.0.2",
"@fastify/multipart": "^9.3.0",
@ -31,5 +32,9 @@
"rollup-plugin-node-externals": "^8.1.2",
"vite": "^7.3.0",
"vite-tsconfig-paths": "^5.1.4"
=======
"fastify-socket.io": "^5.1.0",
"socket.io": "^4.8.1"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
}
}