From a978589f565e7a5c8aa14047271541ddd1eaa613 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 19 Apr 2024 10:39:18 +0800
Subject: [PATCH] 1

---
 src/types/components.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 7762c0420..e39ad0445 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
@@ -177,5 +176,3 @@ declare module '@vue/runtime-core' {
     vLoading: typeof import('element-plus/es')['ElLoadingDirective']
   }
 }
-=======
->>>>>>> v7_master