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

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-10-28 09:07:14 +05:30
committed by GitHub
parent b52b04a10c
commit 977f385006
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/bank_transaction/bank_transaction.json
View File

@@ -238,11 +238,7 @@
"grid_page_length": 50, "grid_page_length": 50,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-10-14 11:53:45.908169",
=======
"modified": "2025-10-23 17:32:58.514807", "modified": "2025-10-23 17:32:58.514807",
>>>>>>> a2a41a0eaa (fix(Bank Transaction): make transaction ID non-unique)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Transaction", "name": "Bank Transaction",