nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-07-09 10:39:02 +05:30
parent 57896a8f99
commit f281e064f2
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
View File

@@ -211,19 +211,7 @@
], ],
"hide_toolbar": 1, "hide_toolbar": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2022-09-07 11:11:40.293317",
=======
"modified": "2024-06-25 15:34:35.214946",
>>>>>>> 13fb560401 (fix: custom delimiters)
=======
"modified": "2024-06-25 16:33:50.675848",
>>>>>>> b202409428 (fix: remove deprecated field "statement_import_log")
=======
"modified": "2024-06-25 17:32:07.658250", "modified": "2024-06-25 17:32:07.658250",
>>>>>>> 98ad01c736 (fix: field position)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Statement Import", "name": "Bank Statement Import",