merge conflicts resolved.

This commit is contained in:
Kartik Datrika
2026-03-25 12:15:37 +05:30
parent dc59189cc6
commit 698bdf488a
65 changed files with 458 additions and 179 deletions

View File

@@ -1,8 +1,7 @@
import type { ReactNode, Ref } from "react";
import { faCircleQuestion } from "@fortawesome/pro-duotone-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import type { LabelProps as AriaLabelProps } from "react-aria-components";
import { Label as AriaLabel } from "react-aria-components";
import { Label as AriaLabel, type LabelProps as AriaLabelProps } from "react-aria-components";
import { Tooltip, TooltipTrigger } from "@/components/base/tooltip/tooltip";
import { cx } from "@/utils/cx";