Skip to content

Commit 6d6047c

Browse files
Merge branch 'main' of github.com:dzangolab/react into feat/support-group-options
2 parents d75d6fe + 4ddd0e9 commit 6d6047c

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

  • apps/demo/src/Views/Ui/components/FormWidgets

apps/demo/src/Views/Ui/components/FormWidgets/Select.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,11 @@ const [singleSelectGroupValue, setSingleSelectGroupValue] = useState<string>("")
680680
/>
681681
<CodeBlock
682682
exampleCode='
683+
<<<<<<< HEAD
683684
const [multiSelectGroupValue, setMultiSelectGroupValue] = useState<string[]>([]);
685+
=======
686+
const [multiSelectPlaceholder, setMultiSelectPlaceholder] = useState<string>("");
687+
>>>>>>> 4ddd0e9abd575df52d8e1f7a93e33f0667359528
684688
685689
<Select
686690
label={t("select.label")}

0 commit comments

Comments
 (0)