Skip to content

Commit 8c90ca2

Browse files
committed
restore button
1 parent 4734de3 commit 8c90ca2

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/components/Button/Button.tsx

-11
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ export interface ButtonProps extends React.HTMLAttributes<HTMLButtonElement> {
1515
align?: Alignment;
1616
fillWidth?: boolean;
1717
loading?: boolean;
18-
<<<<<<< HEAD
19-
||||||| merged common ancestors
20-
>>>>>>>>> Temporary merge branch 2
21-
=======
22-
as?: unknown;
23-
>>>>>>> 0cfd13da5869704b2c729341807dab164e280ff4
2418
}
2519

2620
export const Button = ({
@@ -40,12 +34,7 @@ export const Button = ({
4034
$align={align}
4135
$fillWidth={fillWidth}
4236
disabled={disabled || loading}
43-
<<<<<<< HEAD
4437
role="button"
45-
||||||| merged common ancestors
46-
>>>>>>>>> Temporary merge branch 2
47-
=======
48-
>>>>>>> 0cfd13da5869704b2c729341807dab164e280ff4
4938
{...delegated}
5039
>
5140
{iconLeft && (

0 commit comments

Comments
 (0)