From 1fac17b36f536d3b2995a983774e035c4acae4be Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 15 Oct 2024 06:00:12 +0530 Subject: [PATCH] chore: resolve conflict --- .../doctype/unreconcile_payment/unreconcile_payment.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json index 8ba79581d50..f2c2f380fe9 100644 --- a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json +++ b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json @@ -56,11 +56,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-08-28 17:42:50.261377", -======= "modified": "2024-10-10 12:03:50.022444", ->>>>>>> e8e1ec0e85 (refactor: remove 'format:' based naming) "modified_by": "Administrator", "module": "Accounts", "name": "Unreconcile Payment",