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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-10-15 06:00:12 +05:30
parent 9d05a6ebc0
commit 1fac17b36f
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/unreconcile_payment/unreconcile_payment.json
View File

@@ -56,11 +56,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-08-28 17:42:50.261377",
=======
"modified": "2024-10-10 12:03:50.022444", "modified": "2024-10-10 12:03:50.022444",
>>>>>>> e8e1ec0e85 (refactor: remove 'format:' based naming)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Unreconcile Payment", "name": "Unreconcile Payment",