From 652f7a070f7a65a01054089fdd91b8bcf07d0694 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期六, 28 九月 2024 20:41:33 +0800
Subject: [PATCH] merge
---
src/components.d.ts | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/components.d.ts b/src/components.d.ts
index 9861f81..59b1004 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -29,10 +29,7 @@
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
-<<<<<<< HEAD
-=======
ElDrawer: typeof import('element-plus/es')['ElDrawer']
->>>>>>> hc-evalution
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
--
Gitblit v1.9.3