Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rebornix/notebook

Browse Source
This commit is contained in:
Peng Lyu
2019-12-09 11:04:24 -08:00
parent ff0bd19e73 a416c77e56
commit 8d8580260f
257 changed files with 5971 additions and 3106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/workbench.common.main.ts
View File

@@ -80,6 +80,7 @@ import 'vs/workbench/services/extensionManagement/common/extensionEnablementServ
import 'vs/workbench/services/notification/common/notificationService';
import 'vs/workbench/services/extensions/common/staticExtensions';
import 'vs/workbench/services/userDataSync/common/settingsMergeService';
import 'vs/workbench/services/userDataSync/common/userDataSyncUtil';
import 'vs/workbench/services/path/common/remotePathService';
import 'vs/workbench/services/remote/common/remoteExplorerService';
import 'vs/workbench/services/workingCopy/common/workingCopyService';
@@ -262,7 +263,4 @@ import 'vs/workbench/contrib/userDataSync/browser/userDataSync.contribution';
// Code Actions
import 'vs/workbench/contrib/codeActions/common/codeActions.contribution';
// Test Custom Editors
import 'vs/workbench/contrib/testCustomEditors/browser/testCustomEditors';
//#endregion