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,5 +1,4 @@
import type { FC, ReactNode, Ref } from "react";
import { isValidElement } from "react";
import { type FC, type ReactNode, type Ref, isValidElement } from "react";
import { cx, sortCx } from "@/utils/cx";
import { isReactComponent } from "@/utils/is-react-component";

View File

@@ -1,5 +1,4 @@
import type { SVGProps } from "react";
import { useId } from "react";
import { type SVGProps, useId } from "react";
import { cx } from "@/utils/cx";
export const UntitledLogoMinimal = (props: SVGProps<SVGSVGElement>) => {

View File

@@ -1,5 +1,4 @@
import type { HTMLAttributes, SVGProps } from "react";
import { useId } from "react";
import { type HTMLAttributes, type SVGProps, useId } from "react";
import { cx } from "@/utils/cx";
// eslint-disable-next-line react-refresh/only-export-components