remove error line

3a73d7f4 · Joel · 60e1cbed · 3a73d7f4
Commit 3a73d7f4 authored Jul 27, 2023 by Joel
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

index.ts ...pp/components/base/icons/src/vender/line/general/index.ts +0 -1

No files found.
--- a/web/app/components/base/icons/src/vender/line/general/index.ts
+++ b/web/app/components/base/icons/src/vender/line/general/index.ts
 export { default as Check } from './Check'
-<<<<<<<<< Temporary merge branch 1
 export { default as Edit03 } from './Edit03'
 export { default as Hash02 } from './Hash02'
 export { default as LinkExternal02 } from './LinkExternal02'