From 2f9bd97deb5fe141564c0b830e494a010f8c3c87 Mon Sep 17 00:00:00 2001
From: Shivank Kacker <kacker.shivank@gmail.com>
Date: Thu, 24 Oct 2024 23:59:15 +0530
Subject: [PATCH] fix merge conflicts

---
 src/components/Facility/Consultations/Beds.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/Facility/Consultations/Beds.tsx b/src/components/Facility/Consultations/Beds.tsx
index acd08602d1a..982780b74e4 100644
--- a/src/components/Facility/Consultations/Beds.tsx
+++ b/src/components/Facility/Consultations/Beds.tsx
@@ -11,12 +11,7 @@ import ButtonV2 from "@/components/Common/components/ButtonV2";
 import CareIcon from "../../../CAREUI/icons/CareIcon";
 import CircularProgress from "@/components/Common/components/CircularProgress";
 import { FieldLabel } from "../../Form/FormFields/FormField";
-<<<<<<< HEAD:src/Components/Facility/Consultations/Beds.tsx
-import Loading from "../../Common/Loading";
-=======
 import Loading from "@/components/Common/Loading";
-import TextFormField from "../../Form/FormFields/TextFormField";
->>>>>>> c62b36dae1e6b6f1a313d3d6fc8bcea1ea80dd71:src/components/Facility/Consultations/Beds.tsx
 import dayjs from "../../../Utils/dayjs";
 import { AssetSelect } from "@/components/Common/AssetSelect";
 import DialogModal from "@/components/Common/Dialog";