From a966b51e56e7f1a30c4df7d9623e32c18fb889aa Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Mon, 14 Feb 2022 13:40:27 +0200
Subject: [PATCH] Fix merge conflicts

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 .../terminal-shell-env-modify.injectable.ts               | 8 +++++---
 .../status-bar/registered-status-bar-items.injectable.tsx | 2 ++
 .../components/status-bar/status-bar-items.injectable.ts  | 2 ++
 src/renderer/components/status-bar/status-bar.test.tsx    | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts
index a6bd842f61..d0c6e2c54b 100644
--- a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts
+++ b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts
@@ -6,14 +6,16 @@
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
 import { terminalShellEnvModify } from "./terminal-shell-env-modifiers";
- 
+
 const terminalShellEnvModifyInjectable = getInjectable({
+  id: "terminal-shell-env-modify",
+
   instantiate: (di) =>
     terminalShellEnvModify({
       extensions: di.inject(mainExtensionsInjectable),
     }),
- 
+
   lifecycle: lifecycleEnum.singleton,
 });
- 
+
 export default terminalShellEnvModifyInjectable;
diff --git a/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx b/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx
index b99edba382..14c5f4af14 100644
--- a/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx
+++ b/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx
@@ -63,6 +63,8 @@ function getRegisteredStatusBarItems({ registrations }: Dependencies): IComputed
 }
 
 const registeredStatusBarItemsInjectable = getInjectable({
+  id: "registered-status-bar-items",
+
   instantiate: (di) => getRegisteredStatusBarItems({
     registrations: di.inject(statusBarItemsInjectable),
   }),
diff --git a/src/renderer/components/status-bar/status-bar-items.injectable.ts b/src/renderer/components/status-bar/status-bar-items.injectable.ts
index 33d04cb0fe..193ac027d8 100644
--- a/src/renderer/components/status-bar/status-bar-items.injectable.ts
+++ b/src/renderer/components/status-bar/status-bar-items.injectable.ts
@@ -7,6 +7,8 @@ import { computed } from "mobx";
 import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable";
 
 const statusBarItemsInjectable = getInjectable({
+  id: "status-bar-items",
+
   instantiate: (di) => {
     const extensions = di.inject(rendererExtensionsInjectable);
 
diff --git a/src/renderer/components/status-bar/status-bar.test.tsx b/src/renderer/components/status-bar/status-bar.test.tsx
index 6055edf403..95d747b85b 100644
--- a/src/renderer/components/status-bar/status-bar.test.tsx
+++ b/src/renderer/components/status-bar/status-bar.test.tsx
@@ -10,7 +10,7 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import type { DiRender } from "../test-utils/renderFor";
 import { renderFor } from "../test-utils/renderFor";
 import { computed, IObservableArray, observable } from "mobx";
-import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
 import statusBarItemsInjectable from "./status-bar-items.injectable";
 import type { StatusBarRegistration } from "./status-bar-registration";
 import { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
@@ -35,7 +35,7 @@ class SomeTestExtension extends LensRendererExtension {
 
 describe("<StatusBar />", () => {
   let render: DiRender;
-  let di: ConfigurableDependencyInjectionContainer;
+  let di: DiContainer;
   let statusBarItems: IObservableArray<any>;
 
   beforeEach(async () => {