mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-19 23:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict due to same changed import line

Browse Source
This commit is contained in:
Sirz Benjie 2025-02-02 17:04:16 -06:00
parent 9f05732038
commit b0d745d109
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/field/pokemon.ts
View File

@ -38,7 +38,8 @@ import {
RespectAttackTypeImmunityAttr, RespectAttackTypeImmunityAttr,
MoveTarget, MoveTarget,
CombinedPledgeStabBoostAttr, CombinedPledgeStabBoostAttr,
VariableMoveTypeChartAttr, MoveFlags, VariableMoveTypeChartAttr,
MoveFlags,
HpSplitAttr HpSplitAttr
} from "#app/data/move"; } from "#app/data/move";
import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; import type { PokemonSpeciesForm } from "#app/data/pokemon-species";