From 45d36567ecb4dd7faf634abbd9a8edfa7168ecf6 Mon Sep 17 00:00:00 2001
From: Christopher Schmidt <schmidtc086@outlook.com>
Date: Mon, 16 Sep 2024 19:14:01 -0400
Subject: [PATCH] Merge and fix conflicts

---
 src/test/moves/sparkly_swirl.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/moves/sparkly_swirl.test.ts b/src/test/moves/sparkly_swirl.test.ts
index 55a3d4661d4..2a0a9d42348 100644
--- a/src/test/moves/sparkly_swirl.test.ts
+++ b/src/test/moves/sparkly_swirl.test.ts
@@ -1,6 +1,6 @@
-import { allMoves } from "#app/data/move.js";
-import { StatusEffect } from "#app/enums/status-effect.js";
-import { CommandPhase } from "#app/phases/command-phase.js";
+import { allMoves } from "#app/data/move";
+import { StatusEffect } from "#app/enums/status-effect";
+import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";