From d58602f1a15e042999d015d694a31923576cf122 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Thu, 12 Oct 2023 17:21:56 +0200
Subject: [PATCH] Fix merge conflicts

---
 packages/controller/src/ControlConnection.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/controller/src/ControlConnection.ts b/packages/controller/src/ControlConnection.ts
index b02e6f03..85a26170 100644
--- a/packages/controller/src/ControlConnection.ts
+++ b/packages/controller/src/ControlConnection.ts
@@ -1,4 +1,5 @@
 import type WsServerConnector from "./WsServerConnector";
+import type { HostInfo } from "./HostConnection";
 
 import events from "events";
 import fs from "fs-extra";