From 2af3c2a115a8ed4dc88cab8e5d7019da4a71b7ec Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Tue, 28 Jan 2025 07:50:01 -0800
Subject: [PATCH] fix rebase errors

---
 src/core/execution/FakeHumanExecution.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/execution/FakeHumanExecution.ts b/src/core/execution/FakeHumanExecution.ts
index e5e230436..956e854ef 100644
--- a/src/core/execution/FakeHumanExecution.ts
+++ b/src/core/execution/FakeHumanExecution.ts
@@ -1,4 +1,4 @@
-import { AllianceRequest, Cell, Difficulty, Execution, Game, Player, PlayerInfo, PlayerType, Relation, TerrainType, TerraNullius, UnitType } from "../game/Game"
+import { AllianceRequest, Cell, Difficulty, Execution, Game, Player, PlayerInfo, PlayerType, Relation, TerrainType, TerraNullius, Tick, UnitType } from "../game/Game"
 import { PseudoRandom } from "../PseudoRandom"
 import { AttackExecution } from "./AttackExecution";
 import { TransportShipExecution } from "./TransportShipExecution";