We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 262963c commit f255cdbCopy full SHA for f255cdb
lib/vscode/src/vs/workbench/services/extensions/browser/extensionService.ts
@@ -87,11 +87,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
87
if (code === ExtensionHostExitCode.StartTimeout60s) {
88
this._notificationService.prompt(
89
Severity.Error,
90
-<<<<<<< HEAD
91
- nls.localize('extensionService.startTimeout', 'The Web Worker Extension Host did not start in 10s.'),
92
-=======
93
nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 60s."),
94
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
95
[]
96
);
97
return;
0 commit comments