hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-10-20 08:42:59 +03:00
parent dadb53b3e0
commit ea6d2a2365
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/getDiForUnitTesting.tsx
View File

@ -95,7 +95,6 @@ export const getDiForUnitTesting = (
[ [
startTopbarStateSyncInjectable, startTopbarStateSyncInjectable,
setupSystemCaInjectable, setupSystemCaInjectable,
setupOnApiErrorListenersInjectable
].forEach((injectable) => { ].forEach((injectable) => {
di.override(injectable, () => ({ di.override(injectable, () => ({
id: injectable.id, id: injectable.id,
@ -159,7 +158,6 @@ export const getDiForUnitTesting = (
}) as unknown as HotbarStore); }) as unknown as HotbarStore);
di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore); di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore);
di.override(defaultShellInjectable, () => "some-default-shell");
di.override(userStoreInjectable, () => ({ di.override(userStoreInjectable, () => ({
isTableColumnHidden: () => false, isTableColumnHidden: () => false,