From 614156bbe7c25bec6bef16132d9c91709176127a Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Fri, 20 Oct 2023 11:22:11 +0700
Subject: [PATCH] update

---
 frontend/dashboard/src/pages/Corporates/Index.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/dashboard/src/pages/Corporates/Index.tsx b/frontend/dashboard/src/pages/Corporates/Index.tsx
index 070ead9c..11c2936e 100644
--- a/frontend/dashboard/src/pages/Corporates/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Index.tsx
@@ -297,11 +297,7 @@ export default function Corporates() {
               Import
             </Button> */}
           <Link to={'/corporates/create'}>
-<<<<<<< HEAD
             <Button variant="contained" startIcon={<AddIcon sx={{}} />} sx={{ p: 1.8, typography: 'subtitle2' }}> 
-=======
-            <Button variant="contained" startIcon={<AddIcon sx={{}} />} sx={{ p: 1.8, typography: 'subtitle2', backgroundColor: '#19BBBB'  }}>
->>>>>>> 8a3b0f3d1185955685128bc197a50193b837ddc1
               New Corporate
             </Button>
           </Link>