File tree Expand file tree Collapse file tree 1 file changed +0
-7
lines changed
lib/vscode/src/vs/workbench/browser Expand file tree Collapse file tree 1 file changed +0
-7
lines changed Original file line number Diff line number Diff line change @@ -39,12 +39,8 @@ import { BufferLogService } from 'vs/platform/log/common/bufferLog';
3939import { FileLogService } from 'vs/platform/log/common/fileLogService' ;
4040import { toLocalISOString } from 'vs/base/common/date' ;
4141import { isWorkspaceToOpen , isFolderToOpen } from 'vs/platform/windows/common/windows' ;
42- < < < << << HEAD
43- import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces' ;
4442import { initialize } from 'vs/server/browser/client' ;
45- === === =
4643import { getSingleFolderWorkspaceIdentifier , getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces' ;
47- >>> >>> > 89 b6e0164fa770333755b11504e19a4232b1a2d4
4844import { coalesce } from 'vs/base/common/arrays' ;
4945import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider' ;
5046import { 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- >>> > >>> 89 b6e0164fa770333755b11504e19a4232b1a2d4
110103
111104 // Return API Facade
112105 return instantiationService . invokeFunction ( accessor => {
You can’t perform that action at this time.
0 commit comments