resolve conflict

d3cb0048 · StyleZhang · 9db5f722 · d3cb0048
Commit d3cb0048 authored Jul 07, 2023 by StyleZhang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

index.ts ...p/components/base/icons/src/vender/solid/general/index.ts +0 -1

No files found.
--- a/web/app/components/base/icons/src/vender/solid/general/index.ts
+++ b/web/app/components/base/icons/src/vender/solid/general/index.ts
 export { default as Download02 } from './Download02'
 export { default as XCircle } from './XCircle'
-export { default as Download02 } from './Download02'