Fix typo in MergeDecorator class name

sergey-kintsel · chrmarti · commit 31baddd5947f · 2018-01-08T12:09:08.000+01:00
diff --git a/extensions/merge-conflict/src/mergeDecorator.ts b/extensions/merge-conflict/src/mergeDecorator.ts
@@ -7,7 +7,7 @@ import * as interfaces from './interfaces';
 import { loadMessageBundle } from 'vscode-nls';
 const localize = loadMessageBundle();
 
-export default class MergeDectorator implements vscode.Disposable {
+export default class MergeDecorator implements vscode.Disposable {
 
 	private decorations: { [key: string]: vscode.TextEditorDecorationType } = {};
 
@@ -249,4 +249,4 @@ export default class MergeDectorator implements vscode.Disposable {
 			}
 		});
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import * as interfaces from './interfaces';`
`7`	`7`	`import { loadMessageBundle } from 'vscode-nls';`
`8`	`8`	`const localize = loadMessageBundle();`
`9`	`9`
`10`		`-export default class MergeDectorator implements vscode.Disposable {`
	`10`	`+export default class MergeDecorator implements vscode.Disposable {`
`11`	`11`
`12`	`12`	`private decorations: { [key: string]: vscode.TextEditorDecorationType } = {};`
`13`	`13`
`@@ -249,4 +249,4 @@ export default class MergeDectorator implements vscode.Disposable {`
`249`	`249`	`}`
`250`	`250`	`});`
`251`	`251`	`}`
`252`		`-}`
	`252`	`+}`