cleanup post rebase

MetaMask · Jan 16, 2025 · e3eefdb · e3eefdb
1 parent e411986
commit e3eefdb
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/core/Engine/Engine.ts b/app/core/Engine/Engine.ts
@@ -2187,14 +2187,11 @@ export default {
       ApprovalController,
       LoggingController,
       AccountsController,
-<<<<<<< HEAD
       SignatureController,
-=======
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       MultichainBalancesController,
       RatesController,
       ///: END:ONLY_INCLUDE_IF
->>>>>>> 695f26f38 (start fetching balance)
     };
   },