Skip to content

Commit f255cdb

Browse files
committed
fix: update text for Extension Host
1 parent 262963c commit f255cdb

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
8787
if (code === ExtensionHostExitCode.StartTimeout60s) {
8888
this._notificationService.prompt(
8989
Severity.Error,
90-
<<<<<<< HEAD
91-
nls.localize('extensionService.startTimeout', 'The Web Worker Extension Host did not start in 10s.'),
92-
=======
9390
nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 60s."),
94-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
9591
[]
9692
);
9793
return;

0 commit comments

Comments
 (0)