From 558691e2189353f879cf143dd7f5eb7670598842 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 2 Dec 2024 18:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 67ff3cc..a90f044 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -10,10 +10,6 @@ declare module 'vue' {
     Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCascader: typeof import('element-plus/es')['ElCascader']
-<<<<<<< HEAD
-=======
-    ElCol: typeof import('element-plus/es')['ElCol']
->>>>>>> dev-sy
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElForm: typeof import('element-plus/es')['ElForm']