ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-13 11:38:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode bd0efff9e3f36d6b3e1045cee9887003af8034d7

Browse Source
This commit is contained in:
ADS Merger
2020-05-06 02:35:49 +00:00
parent 9a7810cbee
commit 8420d9f04e
243 changed files with 4276 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/bulkEdit/browser/conflicts.ts
View File

@@ -87,7 +87,7 @@ export class ConflictDetector {
}
list(): URI[] {
return this._conflicts.keys();
return [...this._conflicts.keys()];
}
hasConflicts(): boolean {