From 39150184008bcf7accdbddae2d6b9276ed3fdf5b Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Mon, 9 Sep 2024 07:00:32 +0530 Subject: [PATCH] chore: resolve conflicts with backport --- .../process_payment_reconciliation.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json index b0584dd4c4d..0511571d754 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json +++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json @@ -158,11 +158,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-08-11 10:56:51.699137", -======= "modified": "2024-08-27 14:48:56.715320", ->>>>>>> 143209f91a (fix: `default_advance_account` field in Process Payment Reconciliation) "modified_by": "Administrator", "module": "Accounts", "name": "Process Payment Reconciliation",