From bede21aff20f736c18afcd39ef6e94a4ecae76a5 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 4 Nov 2025 14:11:47 +0530
Subject: [PATCH] added

---
 src/components/PaymentRequest/ManagePaymentRequest.jsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/PaymentRequest/ManagePaymentRequest.jsx b/src/components/PaymentRequest/ManagePaymentRequest.jsx
index 896d190f..1a0b1d82 100644
--- a/src/components/PaymentRequest/ManagePaymentRequest.jsx
+++ b/src/components/PaymentRequest/ManagePaymentRequest.jsx
@@ -27,15 +27,10 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
         loading: ExpenseLoading,
         error: ExpenseError,
     } = useExpenseCategory();
-<<<<<<< HEAD
 
     const { profile } = useProfile();
 
     const schema = PaymentRequestSchema(ExpenseTypes);
-=======
-    
-    const schema = PaymentRequestSchema(ExpenseCategories);
->>>>>>> 616b986deb72f0ce67df8c82beb16f2703acc11a
     const { register, control, watch, handleSubmit, setValue, reset, formState: { errors }, } = useForm({
         resolver: zodResolver(schema),
         defaultValues: defaultPaymentRequest,