ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-30 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 1ce89e2cb720d69c496c2815c4696ee4fd4429a6 (#6779)

Browse Source 
* Merge from vscode 1ce89e2cb720d69c496c2815c4696ee4fd4429a6

* redisable accounts because of issues
This commit is contained in:
Anthony Dresser
2019-08-15 23:56:46 -07:00
committed by GitHub
parent fb4e3c6a05
commit 6f297efb88
166 changed files with 1941 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,9 +124,7 @@ import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
// Preferences
import 'vs/workbench/contrib/preferences/browser/preferences.contribution';
import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences';
import { PreferencesSearchService } from 'vs/workbench/contrib/preferences/browser/preferencesSearch';
registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);
import 'vs/workbench/contrib/preferences/browser/preferencesSearch';
// Logs
import 'vs/workbench/contrib/logs/common/logs.contribution';
@@ -233,4 +231,7 @@ import 'vs/workbench/contrib/outline/browser/outline.contribution';
// Experiments
import 'vs/workbench/contrib/experiments/browser/experiments.contribution';
// Send a Smile
import 'vs/workbench/contrib/feedback/browser/feedback.contribution';
//#endregion