update

2023-10-20 11:22:11 +07:00
parent c380eccc56
commit 614156bbe7
1 changed files with 0 additions and 4 deletions
--- 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>