mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Fix merge conflicts
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
parent
dadb53b3e0
commit
ea6d2a2365
@ -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,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user