From a6d4b24733ef7da9292e572100953153579180bf Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Feb 2021 10:39:08 -0600 Subject: [PATCH] Resolve extensions viewlet conflicts --- .../contrib/extensions/browser/extensionsViewlet.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts index 365e2f484..ba1b60e2d 100644 --- a/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts +++ b/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts @@ -32,11 +32,7 @@ import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import Severity from 'vs/base/common/severity'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; -<<<<<<< HEAD -import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; -======= -import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService'; ->>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775 +import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewDescriptorService, IAddedViewDescriptorRef } from 'vs/workbench/common/views'; import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; @@ -65,13 +61,10 @@ import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; import { WorkbenchStateContext } from 'vs/workbench/browser/contextkeys'; import { ICommandService } from 'vs/platform/commands/common/commands'; -<<<<<<< HEAD import { textLinkForeground } from 'vs/platform/theme/common/colorRegistry'; -======= import { isWeb } from 'vs/base/common/platform'; import { memoize } from 'vs/base/common/decorators'; import { filterIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons'; ->>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775 const DefaultViewsContext = new RawContextKey('defaultExtensionViews', true); const SearchMarketplaceExtensionsContext = new RawContextKey('searchMarketplaceExtensions', false);