🔀 merge(AccordionComponent/index.tsx): resolve merge conflict in AccordionComponent/index.tsx file
🐛 fix(AccordionComponent/index.tsx): remove unnecessary code after resolving merge conflict
This commit is contained in:
parent
c602fe5347
commit
40b656c8d4
1 changed files with 0 additions and 5 deletions
|
|
@ -34,7 +34,6 @@ export default function AccordionComponent({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<<<<<<< HEAD
|
|
||||||
<Accordion
|
<Accordion
|
||||||
type="single"
|
type="single"
|
||||||
className="w-full"
|
className="w-full"
|
||||||
|
|
@ -42,10 +41,6 @@ export default function AccordionComponent({
|
||||||
onValueChange={setValue}
|
onValueChange={setValue}
|
||||||
>
|
>
|
||||||
<AccordionItem value={keyValue} className="border-b">
|
<AccordionItem value={keyValue} className="border-b">
|
||||||
=======
|
|
||||||
<Accordion type="single" value={value} onValueChange={setValue}>
|
|
||||||
<AccordionItem value={trigger} className="border-none">
|
|
||||||
>>>>>>> bugfix-accordion
|
|
||||||
<AccordionTrigger
|
<AccordionTrigger
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
handleClick();
|
handleClick();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue