fix: parsing error - merge conflict marker encountered

ad956 · Oct 2, 2024 · 98e2e71 · 98e2e71
1 parent 945c454
commit 98e2e71
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git 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<HospitalUserData[]>([]);

diff --git 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<HospitalDetails[]>([]);