andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-14 19:59:53 +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

7
interface/.typesafe-i18n.json
View File

@@ -1,12 +1,5 @@
{
<<<<<<< HEAD
"adapter": "react",
"baseLocale": "pl",
"$schema": "https://unpkg.com/typesafe-i18n@5.22.0/schema/typesafe-i18n.json"
}
=======
"adapter": "react",
"baseLocale": "pl",
"$schema": "https://unpkg.com/typesafe-i18n@5.24.0/schema/typesafe-i18n.json"
}
>>>>>>> 941146db (Warn user in WebUI of unsaved changes #911)