From d242ae6932b0ede4536981a9ca7033691dcc9c5d Mon Sep 17 00:00:00 2001
From: Pranshu Aggarwal <pranshu1902@gmail.com>
Date: Mon, 11 Sep 2023 15:29:45 +0530
Subject: [PATCH] fix conflicts

---
 src/Components/Common/FacilitySelect.tsx | 3 ---
 src/Components/Users/ManageUsers.tsx     | 1 -
 2 files changed, 4 deletions(-)

diff --git a/src/Components/Common/FacilitySelect.tsx b/src/Components/Common/FacilitySelect.tsx
index 19494081aa3..400ce115bc5 100644
--- a/src/Components/Common/FacilitySelect.tsx
+++ b/src/Components/Common/FacilitySelect.tsx
@@ -6,7 +6,6 @@ import { FacilityModel } from "../Facility/models";
 
 interface FacilitySelectProps {
   name: string;
-  exclude_user: string;
   errors?: string | undefined;
   className?: string;
   searchAll?: boolean;
@@ -23,7 +22,6 @@ interface FacilitySelectProps {
 export const FacilitySelect = (props: FacilitySelectProps) => {
   const {
     name,
-    exclude_user,
     multiple,
     selected,
     setSelected,
@@ -47,7 +45,6 @@ export const FacilitySelect = (props: FacilitySelectProps) => {
         search_text: text,
         all: searchAll,
         facility_type: facilityType,
-        exclude_user: exclude_user,
         district,
       };
 
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index d0f1b1e4c27..d2e0ca415e3 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -698,7 +698,6 @@ function UserFacilities(props: { user: any }) {
         <FacilitySelect
           multiple={false}
           name="facility"
-          exclude_user={username}
           showAll={false} // Show only facilities that user has access to link (not all facilities)
           showNOptions={8}
           selected={facility}