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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-04-30 10:25:51 +05:30
committed by GitHub
parent 737c4809e3
commit 03b4a85825
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
View File

@@ -119,11 +119,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-03-07 11:02:24.535714",
=======
"modified": "2024-04-28 14:40:50.910884", "modified": "2024-04-28 14:40:50.910884",
>>>>>>> 9f346e7ba0 (fix: Ignore user perm in Bank Reco Tool for company)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Reconciliation Tool", "name": "Bank Reconciliation Tool",
@@ -144,4 +140,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }