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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-05-23 17:46:23 +05:30
parent c834a9de85
commit 0f9b5074a6
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,11 +53,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-09-26 14:21:27.362567",
=======
"modified": "2024-05-23 17:00:42.984798", "modified": "2024-05-23 17:00:42.984798",
>>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Repost Accounting Ledger", "name": "Repost Accounting Ledger",

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

@@ -98,11 +98,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-09-26 14:21:35.719727",
=======
"modified": "2024-05-23 17:00:31.540640", "modified": "2024-05-23 17:00:31.540640",
>>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Repost Payment Ledger", "name": "Repost Payment Ledger",