andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-13 11:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix package conflicts

Browse Source
This commit is contained in:
proddy
2023-02-05 22:12:27 +01:00
parent 71de48fd32
commit 2ac3640760
3 changed files with 167 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interface/package.json
View File

@@ -26,11 +26,7 @@
"react-icons": "^4.7.1",
"react-scripts": "^5.0.1",
"sockette": "^2.0.6",
<<<<<<< HEAD
"typesafe-i18n": "5.22.0",
=======
"typesafe-i18n": "^5.24.0",
>>>>>>> 941146db (Warn user in WebUI of unsaved changes #911)
"typescript": "^4.9.5",
"axios": "^1.3.2",
"react-router-dom": "^6.8.0"