nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-01-23 16:36:55 +05:30
parent 3c3f092382
commit 10ee6f3e22
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_allocations/process_payment_reconciliation_log_allocations.json
View File

@@ -163,11 +163,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-03-20 21:05:43.121945",
=======
"modified": "2025-01-23 16:09:01.058574", "modified": "2025-01-23 16:09:01.058574",
>>>>>>> a71718883e (refactor: support JE posting date in semi-auto reconciilation tool)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation Log Allocations", "name": "Process Payment Reconciliation Log Allocations",