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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-10-30 10:23:41 +05:30
parent 870709079b
commit ac121dd4e3
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/payment_reconciliation_payment/payment_reconciliation_payment.json
View File

@@ -110,11 +110,7 @@
"is_virtual": 1, "is_virtual": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-11-17 17:33:34.818530",
=======
"modified": "2024-10-29 16:24:43.021230", "modified": "2024-10-29 16:24:43.021230",
>>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Payment", "name": "Payment Reconciliation Payment",