From cb7bdded7168a8c08f4ad395e1be4f445925f2a5 Mon Sep 17 00:00:00 2001 From: Yukthi Date: Tue, 23 Jan 2024 23:00:18 -0500 Subject: [PATCH] fixed weird thing from merge conflict --- Eplant/views/eFP/Viewer/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Eplant/views/eFP/Viewer/index.tsx b/Eplant/views/eFP/Viewer/index.tsx index e8b202b6..d09ba6f1 100644 --- a/Eplant/views/eFP/Viewer/index.tsx +++ b/Eplant/views/eFP/Viewer/index.tsx @@ -381,7 +381,7 @@ export default class EFPViewer sx={(theme) => ({ flexGrow: 1, position: 'relative', - }} + })} > {activeData.viewData[activeViewIndex].supported ? ( <> @@ -413,7 +413,7 @@ export default class EFPViewer state={{ colorMode: state.colorMode, renderAsThumbnail: false, - maskThreshold: props.state.maskThreshold, + maskThreshold: state.maskThreshold, }} />