From 36dbb867ed23f8e66bcdf839096fcfeaf7d0e896 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 8 Jan 2025 09:19:53 +0530 Subject: [PATCH] chore: resolve conflict --- .../process_payment_reconciliation_log.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json index d5e52a72df5..3e3e231fe1d 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json +++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json @@ -109,11 +109,7 @@ "in_create": 1, "index_web_pages_for_search": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-11-02 11:32:12.254018", -======= "modified": "2025-01-08 08:22:19.104975", ->>>>>>> 4620025dcd (chore: remove 'Experimental' tag) "modified_by": "Administrator", "module": "Accounts", "name": "Process Payment Reconciliation Log",