mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
Fix bad merge
This commit is contained in:
parent
0d65571563
commit
cfbebc3faf
|
@ -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(
|
||||
|
|
Loading…
Reference in a new issue