From 898565e16a6c5888da350a1e2f0b4a1cddc0cf13 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 9 Feb 2021 11:11:38 -0600 Subject: [PATCH] Resolve browser telemetry conflict --- lib/vscode/src/vs/workbench/workbench.web.main.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/vscode/src/vs/workbench/workbench.web.main.ts b/lib/vscode/src/vs/workbench/workbench.web.main.ts index 390395396..d8998dbd6 100644 --- a/lib/vscode/src/vs/workbench/workbench.web.main.ts +++ b/lib/vscode/src/vs/workbench/workbench.web.main.ts @@ -41,13 +41,9 @@ import 'vs/workbench/services/textfile/browser/browserTextFileService'; import 'vs/workbench/services/keybinding/browser/keyboardLayoutService'; import 'vs/workbench/services/extensions/browser/extensionService'; import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService'; -<<<<<<< HEAD +import 'vs/workbench/services/extensionManagement/browser/extensionUrlTrustService'; // NOTE@coder: We send it all to the server side to be processed there instead. // import 'vs/workbench/services/telemetry/browser/telemetryService'; -======= -import 'vs/workbench/services/extensionManagement/browser/extensionUrlTrustService'; -import 'vs/workbench/services/telemetry/browser/telemetryService'; ->>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775 import 'vs/workbench/services/configurationResolver/browser/configurationResolverService'; import 'vs/workbench/services/credentials/browser/credentialsService'; import 'vs/workbench/services/url/browser/urlService';