From cfbebc3fafb6a8d5e8a440fe2916bc2c3bed35eb Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 26 Feb 2018 16:52:30 -0800
Subject: [PATCH] Fix bad merge

---
 extensions/markdown/src/features/previewContentProvider.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/extensions/markdown/src/features/previewContentProvider.ts b/extensions/markdown/src/features/previewContentProvider.ts
index 2768af810d7..433d55aaed1 100644
--- a/extensions/markdown/src/features/previewContentProvider.ts
+++ b/extensions/markdown/src/features/previewContentProvider.ts
@@ -285,10 +285,7 @@ class MarkdownPreview {
 	private throttleTimer: any;
 	private initialLine: number | undefined = undefined;
 	private readonly disposables: vscode.Disposable[] = [];
-<<<<<<< HEAD
 	private firstUpdate = true;
-=======
->>>>>>> Scroll sync markdown editor with markdown preview
 	private currentVersion?: { resource: vscode.Uri, version: number };
 
 	constructor(