From 4f13c4e6abe96987f97b88234aa0d6d5b226449a Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 8 Jan 2018 10:33:35 -0800
Subject: [PATCH] Fix bad merge

---
 extensions/typescript/src/features/completionItemProvider.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts
index 11b68a1850e..cfbc5a71637 100644
--- a/extensions/typescript/src/features/completionItemProvider.ts
+++ b/extensions/typescript/src/features/completionItemProvider.ts
@@ -17,7 +17,6 @@ import * as nls from 'vscode-nls';
 import { applyCodeAction } from '../utils/codeAction';
 import * as languageModeIds from '../utils/languageModeIds';
 import { CommandManager, Command } from '../utils/commandManager';
-import { TsServerLogLevel } from '../utils/configuration';
 
 const localize = nls.loadMessageBundle();
 
@@ -195,7 +194,7 @@ class ApplyCompletionCodeActionCommand implements Command {
 }
 
 interface Configuration {
-	useCodeSnippetsOnMethodShowest: boolean;
+	useCodeSnippetsOnMethodSuggest: boolean;
 	nameSuggestions: boolean;
 	quickSuggestionsForPaths: boolean;
 	autoImportSuggestions: boolean;