Fixed merge error

2024-05-15 21:12:31 +02:00 · 2024-05-15 21:12:31 +02:00 · def3f88f66
parent 9e4354595e
commit def3f88f66
5 changed files with 5 additions and 6 deletions
--- a/src/locales/es/config.ts
+++ b/src/locales/es/config.ts
@ -37,6 +37,6 @@ export const esConfig = {
    growth: growth,
    partyUiHandler: partyUiHandler,
    summaryUiHandler: SummaryUiHandler,
-    biome: biome
+    biome: biome,
    weather: weather
 }
--- a/src/locales/fr/config.ts
+++ b/src/locales/fr/config.ts
@ -37,6 +37,6 @@ export const frConfig = {
    growth: growth,
    partyUiHandler: partyUiHandler,
    summaryUiHandler: SummaryUiHandler,
-    biome: biome
+    biome: biome,
    weather: weather
 }
--- a/src/locales/it/config.ts
+++ b/src/locales/it/config.ts
@ -37,6 +37,6 @@ export const itConfig = {
    growth: growth,
    partyUiHandler: partyUiHandler,
    summaryUiHandler: SummaryUiHandler,
-    biome: biome
+    biome: biome,
    weather: weather
 }
--- a/src/locales/pt_BR/config.ts
+++ b/src/locales/pt_BR/config.ts
@ -35,6 +35,6 @@ export const ptBrConfig = {
    growth: growth,
    partyUiHandler: partyUiHandler,
    summaryUiHandler: SummaryUiHandler,
-    biome: biome
+    biome: biome,
    weather: weather
 }
--- a/src/locales/zh_CN/config.ts
+++ b/src/locales/zh_CN/config.ts
@ -35,7 +35,6 @@ export const zhCnConfig = {
    nature: nature,
    partyUiHandler: partyUiHandler,
    summaryUiHandler: SummaryUiHandler,
-    biome: biome
-    nature: nature,
+    biome: biome,
    weather: weather
 }