Skip to content

Commit

Permalink
fixed weird merge conflict thing again
Browse files Browse the repository at this point in the history
  • Loading branch information
Yukthiw committed Jan 24, 2024
1 parent a279707 commit 59a0cef
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions Eplant/UI/Layout/ViewContainer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@ export function ViewContainer<T, S, A>({
position='sticky'
elevation={0}
>
<Toolbar
sx={(theme) => ({
gap: '8px',
paddingRight: 16,
borderStyle: 'solid',
borderWidth: '1px 0px 1px 1px',
borderColor: theme.palette.background.edge,
borderLeftColor: theme.palette.background.edgeLight,
})}
>
<Toolbar
sx={(theme) => ({
gap: '8px',
Expand Down

0 comments on commit 59a0cef

Please sign in to comment.