a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: update text for Extension Host

This commit is contained in:
Joe Previte 2021-02-25 11:44:37 -07:00
parent 262963c9ec
commit f255cdb2cc
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vscode/src/vs/workbench/services/extensions/browser/extensionService.ts
View File

@ -87,11 +87,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
if (code === ExtensionHostExitCode.StartTimeout60s) { if (code === ExtensionHostExitCode.StartTimeout60s) {
this._notificationService.prompt( this._notificationService.prompt(
Severity.Error, Severity.Error,
<<<<<<< HEAD
nls.localize('extensionService.startTimeout', 'The Web Worker Extension Host did not start in 10s.'),
=======
nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 60s."), nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 60s."),
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
[] []
); );
return; return;