From 14dbca8c0748d17f28639353025bcd0d0f205f78 Mon Sep 17 00:00:00 2001 From: kachbit Date: Tue, 28 Nov 2023 17:53:50 -0800 Subject: [PATCH] fix conflict --- frontend/src/components/ui/select.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/ui/select.tsx b/frontend/src/components/ui/select.tsx index a8ed78d..1dcfce0 100644 --- a/frontend/src/components/ui/select.tsx +++ b/frontend/src/components/ui/select.tsx @@ -88,6 +88,10 @@ const SelectContent = React.forwardRef< > {children} @@ -155,4 +159,4 @@ export { SelectSeparator, SelectScrollUpButton, SelectScrollDownButton, -} +} \ No newline at end of file