Merge branch 'ENV-PROD' into 'ENV-DEPLOYMENT-PROD'

chcm See merge request !2367

Merge branch 'ENV-PROD' into 'ENV-DEPLOYMENT-PROD'
chcm See merge request !2367
072d3304 · Riri Novita · 78b83a3f · 150c4a04 · 072d3304
Commit 072d3304 authored Feb 14, 2025 by Riri Novita
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Home.js src/container/Menu/Home.js +0 -4

No files found.
--- a/src/container/Menu/Home.js
+++ b/src/container/Menu/Home.js
@@ -87,11 +87,7 @@ const useStyles = makeStyles((theme) => ({
    },
    padding: 20,
    display: 'flex',
-<<<<<<< HEAD
    backgroundColor: '#273b80'
-=======
-    backgroundColor: '#319c23'
->>>>>>> 6b62ed9909ab356afa97d180033088819e3e7c03
  },
  drawerOpen: {
    width: drawerWidth,