Skip to content

Commit

Permalink
fixed weird thing from merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Yukthiw committed Jan 24, 2024
1 parent 131f4c6 commit cb7bdde
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Eplant/views/eFP/Viewer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ export default class EFPViewer
sx={(theme) => ({
flexGrow: 1,
position: 'relative',
}}
})}
>
{activeData.viewData[activeViewIndex].supported ? (
<>
Expand Down Expand Up @@ -413,7 +413,7 @@ export default class EFPViewer
state={{
colorMode: state.colorMode,
renderAsThumbnail: false,
maskThreshold: props.state.maskThreshold,
maskThreshold: state.maskThreshold,
}}
/>
<PanZoom
Expand Down

0 comments on commit cb7bdde

Please sign in to comment.