From ea6d2a23650d5610fbd081613bf119c5b0bb366c Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Thu, 20 Oct 2022 08:42:59 +0300
Subject: [PATCH] Fix merge conflicts

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/renderer/getDiForUnitTesting.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 8264957dad..d0431516e7 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -95,7 +95,6 @@ export const getDiForUnitTesting = (
     [
       startTopbarStateSyncInjectable,
       setupSystemCaInjectable,
-      setupOnApiErrorListenersInjectable
     ].forEach((injectable) => {
       di.override(injectable, () => ({
         id: injectable.id,
@@ -159,7 +158,6 @@ export const getDiForUnitTesting = (
     }) as unknown as HotbarStore);
 
     di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore);
-    di.override(defaultShellInjectable, () => "some-default-shell");
 
     di.override(userStoreInjectable, () => ({
       isTableColumnHidden: () => false,