Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-05 08:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Matt Bierner
2018-02-26 16:52:30 -08:00
parent 0d65571563
commit cfbebc3faf
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/markdown/src/features/previewContentProvider.ts
View File

@@ -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(