Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into sandy081/settingsProfile

Browse Source
This commit is contained in:
Sandeep Somavarapu
2022-06-01 14:12:03 +02:00
parent d94e927723 ccf48c8761
commit 5178151d23
511 changed files with 11655 additions and 4028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,6 +213,9 @@ import 'vs/workbench/contrib/debug/browser/debugViewlet';
// Markers
import 'vs/workbench/contrib/markers/browser/markers.contribution';
// Merge Editor
import 'vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution';
// Comments
import 'vs/workbench/contrib/comments/browser/comments.contribution';