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 { ReactNode } from "react";
|
||||
import { createContext, useCallback, useContext, useEffect, useState } from "react";
|
||||
import { type ReactNode, createContext, useCallback, useContext, useEffect, useState } from "react";
|
||||
import { apiClient } from "@/lib/api-client";
|
||||
import { ADS_QUERY, CALLS_QUERY, CAMPAIGNS_QUERY, FOLLOW_UPS_QUERY, LEADS_QUERY, LEAD_ACTIVITIES_QUERY, PATIENTS_QUERY } from "@/lib/queries";
|
||||
import {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { type PropsWithChildren } from "react";
|
||||
import { RouterProvider } from "react-aria-components";
|
||||
import { useNavigate } from "react-router";
|
||||
import type { NavigateOptions } from "react-router";
|
||||
import { type NavigateOptions, useNavigate } from "react-router";
|
||||
|
||||
declare module "react-aria-components" {
|
||||
interface RouterConfig {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { createContext, useContext, useEffect, useState } from "react";
|
||||
import { type ReactNode, createContext, useContext, useEffect, useState } from "react";
|
||||
|
||||
type Theme = "light" | "dark" | "system";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user