nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-01-08 09:19:53 +05:30
parent acd66fa00c
commit 36dbb867ed
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
View File

@@ -109,11 +109,7 @@
"in_create": 1, "in_create": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-11-02 11:32:12.254018",
=======
"modified": "2025-01-08 08:22:19.104975", "modified": "2025-01-08 08:22:19.104975",
>>>>>>> 4620025dcd (chore: remove 'Experimental' tag)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation Log", "name": "Process Payment Reconciliation Log",