From 3e4386f3b56adbe81b02a6eb2011fb0e78a39630 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Thu, 13 Jun 2024 08:40:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/components.d.ts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/types/components.d.ts b/src/types/components.d.ts index eac9b2cde..adc4c86e3 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -125,18 +125,6 @@ declare module '@vue/runtime-core' { IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] -<<<<<<< HEAD -<<<<<<< HEAD - IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] -======= - IEpDelete: typeof import('~icons/ep/delete')['default'] - IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] - IEpOperation: typeof import('~icons/ep/operation')['default'] - IEpPlus: typeof import('~icons/ep/plus')['default'] ->>>>>>> lwx_v9 -======= IEpCollection: typeof import('~icons/ep/collection')['default'] IEpDelete: typeof import('~icons/ep/delete')['default'] IEpDownload: typeof import('~icons/ep/download')['default'] @@ -147,7 +135,6 @@ declare module '@vue/runtime-core' { IEpPicture: typeof import('~icons/ep/picture')['default'] IEpPlus: typeof import('~icons/ep/plus')['default'] IEpPosition: typeof import('~icons/ep/position')['default'] ->>>>>>> v8_master IEpRefresh: typeof import('~icons/ep/refresh')['default'] IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default'] IEpSearch: typeof import('~icons/ep/search')['default']