Skip to content

Commit cc59279

Browse files
committed
Remove GoHomeContributor
It's probably registered in some other way now.
1 parent 89c38d3 commit cc59279

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

lib/vscode/src/vs/workbench/browser/actions/navigationActions.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,3 @@ actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(NavigateLeftAc
282282
actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(NavigateRightAction, undefined), 'View: Navigate to the View on the Right', CATEGORIES.View.value);
283283
actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusNextPart, { primary: KeyCode.F6 }), 'View: Focus Next Part', CATEGORIES.View.value);
284284
actionsRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusPreviousPart, { primary: KeyMod.Shift | KeyCode.F6 }), 'View: Focus Previous Part', CATEGORIES.View.value);
285-
<<<<<<< HEAD
286-
287-
const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
288-
workbenchRegistry.registerWorkbenchContribution(GoHomeContributor, LifecyclePhase.Ready);
289-
export const _1 = workbenchRegistry;
290-
export const _2 = GoHomeContributor;
291-
export const _3 = LifecyclePhase.Ready;
292-
=======
293-
>>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775

0 commit comments

Comments
 (0)