From 98e2e71005c0a5ba2d9b54efc44aacc45f933093 Mon Sep 17 00:00:00 2001 From: Anand Suthar Date: Wed, 2 Oct 2024 16:39:22 +0530 Subject: [PATCH] fix: parsing error - merge conflict marker encountered --- app/(pages)/admin/hospitals/[id]/page.tsx | 4 ---- app/(pages)/admin/hospitals/page.tsx | 4 ---- 2 files changed, 8 deletions(-) diff --git a/app/(pages)/admin/hospitals/[id]/page.tsx b/app/(pages)/admin/hospitals/[id]/page.tsx index dcf9f30..337d3a3 100644 --- a/app/(pages)/admin/hospitals/[id]/page.tsx +++ b/app/(pages)/admin/hospitals/[id]/page.tsx @@ -25,11 +25,7 @@ import { import SpinnerLoader from "@components/SpinnerLoader"; import { getHospitalDetails } from "@lib/admin"; import { FaExclamationCircle } from "react-icons/fa"; -<<<<<<< HEAD -import { PaginationMetadata, UserData } from "@pft-types/admin"; -======= import { HospitalUserData, PaginationMetadata } from "@pft-types/admin"; ->>>>>>> main function UserManagement({ params }: { params: { id: string } }) { const [users, setUsers] = useState([]); diff --git a/app/(pages)/admin/hospitals/page.tsx b/app/(pages)/admin/hospitals/page.tsx index 86188da..7f5618d 100644 --- a/app/(pages)/admin/hospitals/page.tsx +++ b/app/(pages)/admin/hospitals/page.tsx @@ -24,11 +24,7 @@ import SpinnerLoader from "@components/SpinnerLoader"; import Link from "next/link"; import { getHospitalsList } from "@lib/admin/getHospitals"; import { FaExclamationCircle } from "react-icons/fa"; -<<<<<<< HEAD import { HospitalDetails, PaginationMetadata } from "@pft-types/admin"; -======= -import { HospitalData, PaginationMetadata } from "@pft-types/admin"; ->>>>>>> main const HospitalManagement: React.FC = () => { const [hospitals, setHospitals] = useState([]);