From a9146efc178ea235640cf961a3312a7fe6b2d7f5 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Fri, 19 Jul 2024 10:36:42 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/accounts/doctype/payment_request/payment_request.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 3872b0777cf..0537ee6d3a3 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -396,11 +396,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-27 09:51:42.277638",
-=======
  "modified": "2024-06-20 13:54:55.245774",
->>>>>>> b823aa66bf (fix: Don't allow negative amount on Payment Request #41905)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",