From 257ca0df4aff9bd1f364ffc61d0fe14fa7053a10 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 26 Jan 2018 17:11:05 +0100
Subject: [PATCH] fix post merge headache

---
 .../api/electron-browser/mainThreadLanguageFeatures.ts         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
index df18b3837a5..8d5bf82d505 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
@@ -258,8 +258,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 			},
 			resolveInitialRenameValue: supportsResolveInitialValues
 				? (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.RenameInitialValue> => wireCancellationToken(token, this._proxy.$resolveInitialRenameValue(handle, model.uri, position))
-				: undefined				
-			}
+				: undefined
 		});
 	}