File tree 1 file changed +0
-7
lines changed
lib/vscode/src/vs/workbench/browser
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';
39
39
import { FileLogService } from 'vs/platform/log/common/fileLogService' ;
40
40
import { toLocalISOString } from 'vs/base/common/date' ;
41
41
import { isWorkspaceToOpen , isFolderToOpen } from 'vs/platform/windows/common/windows' ;
42
- < < < << << HEAD
43
- import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces' ;
44
42
import { initialize } from 'vs/server/browser/client' ;
45
- === === =
46
43
import { getSingleFolderWorkspaceIdentifier , getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces' ;
47
- >>> >>> > 89 b6e0164fa770333755b11504e19a4232b1a2d4
48
44
import { coalesce } from 'vs/base/common/arrays' ;
49
45
import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider' ;
50
46
import { ICommandService } from 'vs/platform/commands/common/commands' ;
@@ -98,15 +94,12 @@ class BrowserMain extends Disposable {
98
94
// Startup
99
95
const instantiationService = workbench . startup ( ) ;
100
96
101
- < < < << << HEAD
102
97
await initialize ( services . serviceCollection ) ;
103
- === === =
104
98
// Window
105
99
this . _register ( instantiationService . createInstance ( BrowserWindow ) ) ;
106
100
107
101
// Logging
108
102
services . logService . trace ( 'workbench configuration' , JSON . stringify ( this . configuration ) ) ;
109
- >>> > >>> 89 b6e0164fa770333755b11504e19a4232b1a2d4
110
103
111
104
// Return API Facade
112
105
return instantiationService . invokeFunction ( accessor => {
You can’t perform that action at this time.
0 commit comments