|
|
@ -27,9 +27,12 @@
|
|
|
|
"react-intl": "^6.5.2",
|
|
|
|
"react-intl": "^6.5.2",
|
|
|
|
"react-router-dom": "^6.18.0",
|
|
|
|
"react-router-dom": "^6.18.0",
|
|
|
|
"react-scripts": "5.0.1",
|
|
|
|
"react-scripts": "5.0.1",
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<<<<<<< HEAD
|
|
|
|
"react-switch": "^7.0.0",
|
|
|
|
"react-switch": "^7.0.0",
|
|
|
|
=======
|
|
|
|
=======
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:)
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<<<<<<< HEAD
|
|
|
|
"socket.io": "^4.7.2",
|
|
|
|
"socket.io": "^4.7.2",
|
|
|
|
"socket.io-client": "^4.7.2",
|
|
|
|
"socket.io-client": "^4.7.2",
|
|
|
@ -44,7 +47,13 @@
|
|
|
|
"socket.io": "^4.7.2",
|
|
|
|
"socket.io": "^4.7.2",
|
|
|
|
"socket.io-client": "^4.7.2",
|
|
|
|
"socket.io-client": "^4.7.2",
|
|
|
|
>>>>>>> 2ba7efc (Début du serveur)
|
|
|
|
>>>>>>> 2ba7efc (Début du serveur)
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
>>>>>>> 6399f16 (Début du serveur)
|
|
|
|
>>>>>>> 6399f16 (Début du serveur)
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
"react-switch": "^7.0.0",
|
|
|
|
|
|
|
|
>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:)
|
|
|
|
|
|
|
|
>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:)
|
|
|
|
"typescript": "^5.2.2",
|
|
|
|
"typescript": "^5.2.2",
|
|
|
|
"vis-network": "^9.1.9",
|
|
|
|
"vis-network": "^9.1.9",
|
|
|
|
"web-vitals": "^2.1.4"
|
|
|
|
"web-vitals": "^2.1.4"
|
|
|
|