Skip to content

T
Tia-dev
Commit 072d3304 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

chcm

See merge request !2367
parents 78b83a3f 150c4a04
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
src/container/Menu/Home.js
View file @ 072d3304
...@@ -87,11 +87,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -87,11 +87,7 @@ const useStyles = makeStyles((theme) => ({
}, },
padding: 20, padding: 20,
display: 'flex', display: 'flex',
<<<<<<< HEAD
backgroundColor: '#273b80' backgroundColor: '#273b80'
=======
backgroundColor: '#319c23'
>>>>>>> 6b62ed9909ab356afa97d180033088819e3e7c03
}, },
drawerOpen: { drawerOpen: {
width: drawerWidth, width: drawerWidth,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment