mirror of
https://dev.azure.com/globalhealthx/EMR/_git/helix-engage
synced 2026-04-12 02:38:15 +00:00
merge conflicts resolved.
This commit is contained in:
@@ -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";
|
||||
|
||||
|
||||
@@ -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>) => {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user