a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve browser telemetry conflict

This commit is contained in:
Asher 2021-02-09 11:11:38 -06:00
parent 948e01fb27
commit 898565e16a
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vscode/src/vs/workbench/workbench.web.main.ts
View File

@ -41,13 +41,9 @@ import 'vs/workbench/services/textfile/browser/browserTextFileService';
import 'vs/workbench/services/keybinding/browser/keyboardLayoutService'; import 'vs/workbench/services/keybinding/browser/keyboardLayoutService';
import 'vs/workbench/services/extensions/browser/extensionService'; import 'vs/workbench/services/extensions/browser/extensionService';
import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService'; 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. // 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/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/configurationResolver/browser/configurationResolverService';
import 'vs/workbench/services/credentials/browser/credentialsService'; import 'vs/workbench/services/credentials/browser/credentialsService';
import 'vs/workbench/services/url/browser/urlService'; import 'vs/workbench/services/url/browser/urlService';