mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-03 23:06:49 +01:00
Merge branch 'master' into proxy-auth
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
import { localize } from 'vs/nls';
|
||||
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
|
||||
import { IWindowsMainService } from 'vs/code/electron-main/windows';
|
||||
import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
|
||||
import { fromEventEmitter } from 'vs/base/node/event';
|
||||
import { BrowserWindow, app } from 'electron';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user