Avoid merge conflict

4e1c5a46 · Martin Aeschlimann · 9f7632cc · 4e1c5a46
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

src/vs/workbench/workbench.main.js src/vs/workbench/workbench.main.js +2 -2

未找到文件。
--- a/src/vs/workbench/workbench.main.js
+++ b/src/vs/workbench/workbench.main.js
@@ -69,14 +69,14 @@ define([

 	'vs/workbench/parts/snippets/electron-browser/snippets.contribution',

+	'vs/workbench/parts/contentprovider/common/contentprovider.contribution',
+
 	'vs/workbench/parts/telemetry/node/appInsights.telemetry.contribution',

 	'vs/workbench/parts/themes/electron-browser/themes.contribution',

 	'vs/workbench/parts/feedback/electron-browser/feedback.contribution',

-	'vs/workbench/parts/contentprovider/common/contentprovider.contribution',
-
 	'vs/workbench/electron-browser/main.contribution',
 	'vs/workbench/electron-browser/main'