Merge branch 'master' into marketplace-cdn

microsoft · Nov 30, 2016 · d1f2d8c · d1f2d8c
2 parents 679387d + 0498fc5
commit d1f2d8c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
@@ -103,7 +103,7 @@ suite('WorkspaceConfigurationEditingService - Node', () => {
 
  return configurationService.initialize().then(() => {
  return {
- configurationEditingService: new ConfigurationEditingService(configurationService, workspaceContextService, environmentService, fileService, textFileService),
+ configurationEditingService: new ConfigurationEditingService(configurationService, workspaceContextService, environmentService, fileService, null, textFileService),
  configurationService
  };
  });