mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-20 07:12:32 +02:00
Fix merge conflict
This commit is contained in:
parent
03d12ca2bd
commit
b679b6ecd0
@ -1,5 +1,5 @@
|
|||||||
import { BattlerIndex } from "#app/battle";
|
import { BattlerIndex } from "#app/battle";
|
||||||
import { allMoves } from "#app/data/move";
|
import { allMoves } from "#app/data/moves/move";
|
||||||
import { BattlerTagType } from "#app/enums/battler-tag-type";
|
import { BattlerTagType } from "#app/enums/battler-tag-type";
|
||||||
import type { PokemonInstantReviveModifier } from "#app/modifier/modifier";
|
import type { PokemonInstantReviveModifier } from "#app/modifier/modifier";
|
||||||
import { Abilities } from "#enums/abilities";
|
import { Abilities } from "#enums/abilities";
|
||||||
|
Loading…
Reference in New Issue
Block a user