chore: resolve conflict

2026-03-20 18:54:55 +00:00 · 2025-10-28 09:07:14 +05:30
parent b52b04a10c
commit 977f385006
1 changed files with 0 additions and 4 deletions
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -238,11 +238,7 @@
 "grid_page_length": 50,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2025-10-14 11:53:45.908169",
-=======
 "modified": "2025-10-23 17:32:58.514807",
->>>>>>> a2a41a0eaa (fix(Bank Transaction): make transaction ID non-unique)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Bank Transaction",