Fix merge conflict

This commit is contained in:
Christopher Schmidt 2025-03-08 08:34:20 -05:00
parent 03d12ca2bd
commit b679b6ecd0

View File

@ -1,5 +1,5 @@
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 type { PokemonInstantReviveModifier } from "#app/modifier/modifier";
import { Abilities } from "#enums/abilities";