Merge from vscode 709a07d51919d3266ca71699c6ddfb2d3547c0e1 (#6575)

This commit is contained in:
Chris LaFreniere
2019-08-02 21:06:44 -07:00
committed by GitHub
parent 402b50c03b
commit 62d2fb534d
103 changed files with 726 additions and 374 deletions

View File

@@ -468,7 +468,7 @@ export class SimpleConfigurationService implements IConfigurationService {
defaults: emptyModel,
user: emptyModel,
workspace: emptyModel,
folders: {}
folders: []
};
}
}