fix conflict
This commit is contained in:
parent
b3a18efa8f
commit
fe321d1c3b
@ -1,4 +1,4 @@
|
|||||||
import { isString, omit } from "@zhst/func";
|
import { isString } from "@zhst/func";
|
||||||
import { fabric } from 'fabric'
|
import { fabric } from 'fabric'
|
||||||
import { ILineOptions } from "fabric/fabric-impl";
|
import { ILineOptions } from "fabric/fabric-impl";
|
||||||
import { Rect } from '../ImageEditor/viewer/shape';
|
import { Rect } from '../ImageEditor/viewer/shape';
|
||||||
|
Loading…
Reference in New Issue
Block a user