From b0d745d109309c8d7ddcc3f326d153cc7725768c Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Sun, 2 Feb 2025 17:04:16 -0600
Subject: [PATCH] Fix merge conflict due to same changed import line

---
 src/field/pokemon.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 629537d5567..97462dbe5ac 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -38,7 +38,8 @@ import {
   RespectAttackTypeImmunityAttr,
   MoveTarget,
   CombinedPledgeStabBoostAttr,
-  VariableMoveTypeChartAttr, MoveFlags,
+  VariableMoveTypeChartAttr,
+  MoveFlags,
   HpSplitAttr
 } from "#app/data/move";
 import type { PokemonSpeciesForm } from "#app/data/pokemon-species";