Fixed merge error
parent
9e4354595e
commit
def3f88f66
|
@ -37,6 +37,6 @@ export const esConfig = {
|
||||||
growth: growth,
|
growth: growth,
|
||||||
partyUiHandler: partyUiHandler,
|
partyUiHandler: partyUiHandler,
|
||||||
summaryUiHandler: SummaryUiHandler,
|
summaryUiHandler: SummaryUiHandler,
|
||||||
biome: biome
|
biome: biome,
|
||||||
weather: weather
|
weather: weather
|
||||||
}
|
}
|
|
@ -37,6 +37,6 @@ export const frConfig = {
|
||||||
growth: growth,
|
growth: growth,
|
||||||
partyUiHandler: partyUiHandler,
|
partyUiHandler: partyUiHandler,
|
||||||
summaryUiHandler: SummaryUiHandler,
|
summaryUiHandler: SummaryUiHandler,
|
||||||
biome: biome
|
biome: biome,
|
||||||
weather: weather
|
weather: weather
|
||||||
}
|
}
|
|
@ -37,6 +37,6 @@ export const itConfig = {
|
||||||
growth: growth,
|
growth: growth,
|
||||||
partyUiHandler: partyUiHandler,
|
partyUiHandler: partyUiHandler,
|
||||||
summaryUiHandler: SummaryUiHandler,
|
summaryUiHandler: SummaryUiHandler,
|
||||||
biome: biome
|
biome: biome,
|
||||||
weather: weather
|
weather: weather
|
||||||
}
|
}
|
|
@ -35,6 +35,6 @@ export const ptBrConfig = {
|
||||||
growth: growth,
|
growth: growth,
|
||||||
partyUiHandler: partyUiHandler,
|
partyUiHandler: partyUiHandler,
|
||||||
summaryUiHandler: SummaryUiHandler,
|
summaryUiHandler: SummaryUiHandler,
|
||||||
biome: biome
|
biome: biome,
|
||||||
weather: weather
|
weather: weather
|
||||||
}
|
}
|
|
@ -35,7 +35,6 @@ export const zhCnConfig = {
|
||||||
nature: nature,
|
nature: nature,
|
||||||
partyUiHandler: partyUiHandler,
|
partyUiHandler: partyUiHandler,
|
||||||
summaryUiHandler: SummaryUiHandler,
|
summaryUiHandler: SummaryUiHandler,
|
||||||
biome: biome
|
biome: biome,
|
||||||
nature: nature,
|
|
||||||
weather: weather
|
weather: weather
|
||||||
}
|
}
|
Loading…
Reference in New Issue