Resolve extensions viewlet conflicts

Author: code-asher

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<boolean>('defaultExtensionViews', true);
 const SearchMarketplaceExtensionsContext = new RawContextKey<boolean>('searchMarketplaceExtensions', false);