From 569a9308282bb24dd57d7498c3c11d36fac8236c Mon Sep 17 00:00:00 2001
From: Owen Craston <owengc12@gmail.com>
Date: Tue, 14 Jan 2025 11:22:50 -0800
Subject: [PATCH] cleanup post rebase

---
 app/core/Engine/Engine.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/core/Engine/Engine.ts b/app/core/Engine/Engine.ts
index 85f9d0a73535..93a51dfae49b 100644
--- a/app/core/Engine/Engine.ts
+++ b/app/core/Engine/Engine.ts
@@ -2183,14 +2183,11 @@ export default {
       ApprovalController,
       LoggingController,
       AccountsController,
-<<<<<<< HEAD
       SignatureController,
-=======
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       MultichainBalancesController,
       RatesController,
       ///: END:ONLY_INCLUDE_IF
->>>>>>> 695f26f38 (start fetching balance)
     };
   },