From 8d813e32565f2eb2ce5708067605e9cf1d816c81 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 27 Sep 2023 11:19:39 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../doctype/payment_request/payment_request.json      | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 8b139e27d46..381f3fb531a 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -317,16 +317,9 @@
   },
   {
    "fieldname": "payment_url",
-<<<<<<< HEAD
    "fieldtype": "Small Text",
    "hidden": 1,
    "label": "payment_url",
-=======
-   "fieldtype": "Data",
-   "hidden": 1,
-   "length": 500,
-   "options": "URL",
->>>>>>> 8c5fcb8257 (fix: PCV posting issues (#37029))
    "read_only": 1
   },
   {
@@ -401,11 +394,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
  "modified": "2022-12-21 16:56:40.115737",
-=======
- "modified": "2023-09-27 09:51:42.277638",
->>>>>>> 8c5fcb8257 (fix: PCV posting issues (#37029))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",