From 09b001211522ea259e0394c6dde51d2dec803b0b Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Tue, 19 Jul 2016 10:11:14 +0200
Subject: [PATCH] fix merge compile error

---
 src/vs/workbench/parts/lib/test/node/configVariables.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/parts/lib/test/node/configVariables.test.ts b/src/vs/workbench/parts/lib/test/node/configVariables.test.ts
index 825d875987e..2858de3005f 100644
--- a/src/vs/workbench/parts/lib/test/node/configVariables.test.ts
+++ b/src/vs/workbench/parts/lib/test/node/configVariables.test.ts
@@ -91,6 +91,7 @@ suite('ConfigVariables tests', () => {
 });
 
 class MockConfigurationService implements IConfigurationService {
+	public _serviceBrand: any;
 	public serviceId = IConfigurationService;
 	public constructor(private configuration: any = {}) { }
 	public loadConfiguration<T>(section?: string): TPromise<T> { return TPromise.as(this.getConfiguration()); }