Skip to content

Commit 2bd9b6e

Browse files
committed
fix: update web.main.ts
Looks like they added two lines in the open method. 1. Logging for workbench configuration 2. Window - creating a BrowserWindow
1 parent ce1a8c8 commit 2bd9b6e

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

lib/vscode/src/vs/workbench/browser/web.main.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,8 @@ import { BufferLogService } from 'vs/platform/log/common/bufferLog';
3939
import { FileLogService } from 'vs/platform/log/common/fileLogService';
4040
import { toLocalISOString } from 'vs/base/common/date';
4141
import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/windows/common/windows';
42-
<<<<<<< HEAD
43-
import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
4442
import { initialize } from 'vs/server/browser/client';
45-
=======
4643
import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
47-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
4844
import { coalesce } from 'vs/base/common/arrays';
4945
import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
5046
import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -98,15 +94,12 @@ class BrowserMain extends Disposable {
9894
// Startup
9995
const instantiationService = workbench.startup();
10096

101-
<<<<<<< HEAD
10297
await initialize(services.serviceCollection);
103-
=======
10498
// Window
10599
this._register(instantiationService.createInstance(BrowserWindow));
106100

107101
// Logging
108102
services.logService.trace('workbench configuration', JSON.stringify(this.configuration));
109-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
110103

111104
// Return API Facade
112105
return instantiationService.invokeFunction(accessor => {

0 commit comments

Comments
 (0)