Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into scm-api

Browse Source
This commit is contained in:
Joao Moreno
2016-12-01 18:04:57 +01:00
parent 251b65688c a29692641d
commit a5812a5e0c
140 changed files with 3854 additions and 1561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHostConfiguration.ts
View File

@@ -35,7 +35,7 @@ function createUsefulConfiguration(data: IWorkspaceConfigurationValues): { data:
valueMap[key] = data[key].value;
}
}
const valueTree = toValuesTree(valueMap);
const valueTree = toValuesTree(valueMap, message => console.error(`Conflict in configuration settings: ${message}`));
return {
data,
valueTree