Skip to content

Commit

Permalink
fix: parsing error - merge conflict marker encountered
Browse files Browse the repository at this point in the history
  • Loading branch information
ad956 committed Oct 2, 2024
1 parent 945c454 commit 98e2e71
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
4 changes: 0 additions & 4 deletions app/(pages)/admin/hospitals/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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[]>([]);
Expand Down
4 changes: 0 additions & 4 deletions app/(pages)/admin/hospitals/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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[]>([]);
Expand Down

0 comments on commit 98e2e71

Please sign in to comment.