fix: fix issue with conflict

VisActor · Jan 26, 2025 · fd189da · fd189da
1 parent 1f20163
commit fd189da
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/vrender-core/src/interface/graphic.ts b/packages/vrender-core/src/interface/graphic.ts
@@ -487,15 +487,11 @@ export type IGraphicStyle = ILayout &
     texturePadding: number;
 
     blur: number;
-<<<<<<< HEAD
     /**
      * 设置图形对应的鼠标样式
      */
     cursor: Cursor | null;
-=======
     filter: string;
-    cursor: Cursor | null; // 鼠标样式
->>>>>>> 27493122 (feat: support backgroundClip)
     renderStyle?: 'default' | 'rough' | any;
     /**
      * HTML的dom或者string