Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar 2023-12-04 12:16:41 +05:30
parent 192343dec2
commit b8b8c02bf9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,11 +156,7 @@
"is_virtual": 1, "is_virtual": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-09-03 07:52:33.684217",
=======
"modified": "2023-11-17 17:33:38.612615", "modified": "2023-11-17 17:33:38.612615",
>>>>>>> 3a51a3f37e (refactor: convert payment reconciliation tool to virtual doctype)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Allocation", "name": "Payment Reconciliation Allocation",