Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-07-21 14:37:13 +07:00
136 changed files with 5831 additions and 16909 deletions
@@ -25,7 +25,7 @@ export const EmptyState = ({
className
)}
>
<FontAwesomeIcon icon={icon} size={iconSize} className="mr-4" />
<FontAwesomeIcon icon={icon} size={iconSize} />
<div className="flex flex-row items-center py-4">
<div className="text-sm text-bunker-300">{title}</div>
<div>{children}</div>