From 59a0cefd7a32f2dd4f99fa7672872e9dbe5c6370 Mon Sep 17 00:00:00 2001 From: Yukthi Date: Tue, 23 Jan 2024 23:15:41 -0500 Subject: [PATCH] fixed weird merge conflict thing again --- Eplant/UI/Layout/ViewContainer/index.tsx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Eplant/UI/Layout/ViewContainer/index.tsx b/Eplant/UI/Layout/ViewContainer/index.tsx index b2f26497..be562932 100644 --- a/Eplant/UI/Layout/ViewContainer/index.tsx +++ b/Eplant/UI/Layout/ViewContainer/index.tsx @@ -76,16 +76,6 @@ export function ViewContainer({ position='sticky' elevation={0} > - ({ - gap: '8px', - paddingRight: 16, - borderStyle: 'solid', - borderWidth: '1px 0px 1px 1px', - borderColor: theme.palette.background.edge, - borderLeftColor: theme.palette.background.edgeLight, - })} - > ({ gap: '8px',