From 61a8de29c39bad44ae506e38107a53521f526f2d Mon Sep 17 00:00:00 2001
From: Phil Price <philip_price@live.com>
Date: Tue, 23 May 2017 11:54:43 -0700
Subject: [PATCH] Remove proposed api references, update configuration title
 localization.

---
 extensions/merge-conflict/package.json          | 3 +--
 extensions/merge-conflict/package.nls.json      | 1 +
 extensions/merge-conflict/src/typings/refs.d.ts | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 69f371c943c..1d099d83c23 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -5,7 +5,6 @@
   "description": "Merge Conflict",
   "version": "0.7.0",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
-  "enableProposedApi": true,
   "engines": {
     "vscode": "^1.5.0"
   },
@@ -101,7 +100,7 @@
       }
     ],
     "configuration": {
-      "title": "Merge Conflict",
+      "title": "%config.title%",
       "properties": {
         "merge-conflict.codeLens.enabled": {
           "type": "boolean",
diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json
index 39e8352a95c..d991f872b44 100644
--- a/extensions/merge-conflict/package.nls.json
+++ b/extensions/merge-conflict/package.nls.json
@@ -9,6 +9,7 @@
 	"command.next": "Next conflict",
 	"command.previous": "Previous conflict",
 	"command.compare": "Compare current conflict",
+	"config.title": "Merge Conflict",
 	"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
 	"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor"
 }
\ No newline at end of file
diff --git a/extensions/merge-conflict/src/typings/refs.d.ts b/extensions/merge-conflict/src/typings/refs.d.ts
index eebe504c7ee..0188b6f9ffc 100644
--- a/extensions/merge-conflict/src/typings/refs.d.ts
+++ b/extensions/merge-conflict/src/typings/refs.d.ts
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
 /// <reference types='@types/node'/>
 /// <reference types='@types/mocha'/>