From b8b8c02bf91699f4b0c7d07d24b37f6092abaf5e Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 4 Dec 2023 12:16:41 +0530 Subject: [PATCH] chore: resolve conflict --- .../payment_reconciliation_allocation.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json b/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json index 682d272ce84c..1fc2f5967bd9 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json +++ b/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json @@ -156,11 +156,7 @@ "is_virtual": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-09-03 07:52:33.684217", -======= "modified": "2023-11-17 17:33:38.612615", ->>>>>>> 3a51a3f37e (refactor: convert payment reconciliation tool to virtual doctype) "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation Allocation",