Fix merge conflicts

2026-10-11 00:28:49 +00:00 · 2022-12-21 11:36:47 -05:00
parent 72664c5bb3 f31424dc6a
commit 6e50adb9ff
134 changed files with 5155 additions and 1488 deletions
@@ -10,8 +10,8 @@ import { Listbox, Transition } from '@headlessui/react';

 interface ListBoxProps {
  selected: string;
-  onChange: () => void;
-  data: string[];
+  onChange: (arg: string) => void;
+  data: string[] | null;
  text?: string;
  buttonAction?: () => void;
  isFull?: boolean;