From def3f88f66d29c81e748995d076a892b94ad382b Mon Sep 17 00:00:00 2001 From: rnicar Date: Wed, 15 May 2024 21:12:31 +0200 Subject: [PATCH] Fixed merge error --- src/locales/es/config.ts | 2 +- src/locales/fr/config.ts | 2 +- src/locales/it/config.ts | 2 +- src/locales/pt_BR/config.ts | 2 +- src/locales/zh_CN/config.ts | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/locales/es/config.ts b/src/locales/es/config.ts index 1b2cf40c6..ca6515ab9 100644 --- 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 } \ No newline at end of file diff --git a/src/locales/fr/config.ts b/src/locales/fr/config.ts index acb3128ca..1f913b7e4 100644 --- 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 } \ No newline at end of file diff --git a/src/locales/it/config.ts b/src/locales/it/config.ts index a84e11f24..8746a478c 100644 --- 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 } \ No newline at end of file diff --git a/src/locales/pt_BR/config.ts b/src/locales/pt_BR/config.ts index 23073d443..f1bc2d72c 100644 --- 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 } \ No newline at end of file diff --git a/src/locales/zh_CN/config.ts b/src/locales/zh_CN/config.ts index aac36537b..f71a862f9 100644 --- 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 } \ No newline at end of file