From 40b656c8d45d69616e619335ad708be363987785 Mon Sep 17 00:00:00 2001
From: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
Date: Mon, 17 Jul 2023 19:55:00 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=80=20merge(AccordionComponent/index.t?=
 =?UTF-8?q?sx):=20resolve=20merge=20conflict=20in=20AccordionComponent/ind?=
 =?UTF-8?q?ex.tsx=20file=20=F0=9F=90=9B=20fix(AccordionComponent/index.tsx?=
 =?UTF-8?q?):=20remove=20unnecessary=20code=20after=20resolving=20merge=20?=
 =?UTF-8?q?conflict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/components/AccordionComponent/index.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/frontend/src/components/AccordionComponent/index.tsx b/src/frontend/src/components/AccordionComponent/index.tsx
index 16a94bfd8..5f5c61b2f 100644
--- a/src/frontend/src/components/AccordionComponent/index.tsx
+++ b/src/frontend/src/components/AccordionComponent/index.tsx
@@ -34,7 +34,6 @@ export default function AccordionComponent({
 
   return (
     <>
-<<<<<<< HEAD
       <Accordion
         type="single"
         className="w-full"
@@ -42,10 +41,6 @@ export default function AccordionComponent({
         onValueChange={setValue}
       >
         <AccordionItem value={keyValue} className="border-b">
-=======
-      <Accordion type="single" value={value} onValueChange={setValue}>
-        <AccordionItem value={trigger} className="border-none">
->>>>>>> bugfix-accordion
           <AccordionTrigger
             onClick={() => {
               handleClick();