fix(resolve): resolve merge issue

This commit is contained in:
rstubryan
2025-10-29 15:56:57 +07:00
41 changed files with 5161 additions and 1734 deletions
+8 -4
View File
@@ -131,10 +131,14 @@ const TextInput = ({
onChange={onChange}
onBlur={onBlur}
disabled={disabled}
className={cn('grow bg-transparent outline-none', {
'cursor-not-allowed': disabled,
'text-gray-500': disabled,
}, className?.input)}
className={cn(
'grow bg-transparent outline-none',
{
'cursor-not-allowed': disabled,
'text-gray-500': disabled,
},
className?.input
)}
readOnly={readOnly}
/>