Skip to content

Commit decbd6e

Browse files
chore: remove merge conflict
1 parent 6d6047c commit decbd6e

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

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

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

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

0 commit comments

Comments
 (0)