From 977f38500677c2e4baa8e25fff988bda0b386e45 Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Tue, 28 Oct 2025 09:07:14 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../accounts/doctype/bank_transaction/bank_transaction.json   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
index b5d7eb1d4b7..599a0604755 100644
--- 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",