ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Hans Pagel
2021-02-05 18:15:59 +01:00
parent 09d311cd42
commit 820cd31e95
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/extension-focus/src/focus.ts
View File

@@ -4,13 +4,7 @@ import { DecorationSet, Decoration } from 'prosemirror-view'
export interface FocusOptions { export interface FocusOptions {
className: string, className: string,
<<<<<<< HEAD
mode: 'all' | 'deepest' | 'shallowest', mode: 'all' | 'deepest' | 'shallowest',
=======
start: 'deep' | 'shallow',
exact: boolean,
// levels: 'all' | number,
>>>>>>> 2959ace822426d014fe3325f0abef8ca797268f4
} }
export const FocusClasses = Extension.create({ export const FocusClasses = Extension.create({