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

fix(lib/vscode): fix conflicts in workbench/workbench.web.main.ts

This commit is contained in:
Akash Satheesan 2021-04-09 12:09:36 +05:30
parent 5bd253709f
commit 4ab306efeb
No known key found for this signature in database
GPG Key ID: 93CBAADFEA703F8E
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,13 +42,8 @@ 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';
import 'vs/workbench/services/extensionManagement/browser/extensionUrlTrustService'; import 'vs/workbench/services/extensionManagement/browser/extensionUrlTrustService';
<<<<<<< HEAD
// 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/configurationResolver/browser/configurationResolverService';
=======
import 'vs/workbench/services/telemetry/browser/telemetryService';
>>>>>>> 801aed93200dc0ccf325a09089c911e8e2b612d0
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';
import 'vs/workbench/services/update/browser/updateService'; import 'vs/workbench/services/update/browser/updateService';