Remove proposed api references, update configuration title localization.

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",

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"
 }

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'/>