Merge from vscode b12f623603e2fc1c5b3037115fa37c1a6acc4165 (#6760)

This commit is contained in:
Anthony Dresser
2019-08-15 02:19:31 -07:00
committed by GitHub
parent 4966ed8b42
commit 58bfba4b47
161 changed files with 2072 additions and 1317 deletions

View File

@@ -225,7 +225,7 @@ export class OpenFolderSettingsAction extends Action {
return this.preferencesService.openFolderSettings(workspaceFolder.uri);
}
return null;
return undefined;
});
}