fix merge conflicts

ohcnetwork · Oct 24, 2024 · 2f9bd97 · 2f9bd97
1 parent f47f372
commit 2f9bd97
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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";