From fd189dab7fe6b9ee03113a47d23913e8e6081961 Mon Sep 17 00:00:00 2001
From: zhouxinyu <zhouxinyu12138@gmail.com>
Date: Sun, 26 Jan 2025 19:27:51 +0800
Subject: [PATCH] fix: fix issue with conflict

---
 packages/vrender-core/src/interface/graphic.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/vrender-core/src/interface/graphic.ts b/packages/vrender-core/src/interface/graphic.ts
index 1e04f93d1..c48d5718d 100644
--- 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