From 7b75573086fda93422d4b3a8c740de1d3b28f456 Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Mon, 2 Sep 2024 00:29:24 -0400 Subject: [PATCH] Beta Update Fix merge conflicts --- src/phases/field-phase.ts | 2 -- src/phases/game-over-phase.ts | 1 - 2 files changed, 3 deletions(-) diff --git a/src/phases/field-phase.ts b/src/phases/field-phase.ts index 1e9a85e46a2..02d1f1395d3 100644 --- a/src/phases/field-phase.ts +++ b/src/phases/field-phase.ts @@ -1,6 +1,4 @@ import { BattlePhase } from "./battle-phase"; -import * as Utils from "#app/utils.js"; -import * as LoggerTools from "../logger"; import Pokemon from "#app/field/pokemon"; type PokemonFunc = (pokemon: Pokemon) => void; diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts index 9369ca6b184..ebe58b20d3e 100644 --- a/src/phases/game-over-phase.ts +++ b/src/phases/game-over-phase.ts @@ -23,7 +23,6 @@ import { SummonPhase } from "./summon-phase"; import { EndCardPhase } from "./end-card-phase"; import { PostGameOverPhase } from "./post-game-over-phase"; import { UnlockPhase } from "./unlock-phase"; -import * as LoggerTools from "../logger"; import { SessionSaveData } from "../system/game-data"; import TrainerData from "../system/trainer-data"; import PokemonData from "../system/pokemon-data";