From ac121dd4e3af3092c3fe86ae2205a6c24f91c127 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 30 Oct 2024 10:23:41 +0530 Subject: [PATCH] chore: resolve conflict --- .../payment_reconciliation_payment.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json index 8e3ff2288aa..010e93558cf 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json @@ -110,11 +110,7 @@ "is_virtual": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-11-17 17:33:34.818530", -======= "modified": "2024-10-29 16:24:43.021230", ->>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation) "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation Payment",