From a04938d5ae9f9312757568ee4e01e18c9f4df901 Mon Sep 17 00:00:00 2001
From: ljain112 <ljain112@gmail.com>
Date: Tue, 25 Jun 2024 15:04:21 +0530
Subject: [PATCH] fix: field position

(cherry picked from commit 98ad01c7360803435ee0f6f809b4681e2fe01d48)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
---
 .../bank_statement_import/bank_statement_import.json      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
index 4d9721f771d..a2eec24023b 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
@@ -11,13 +11,13 @@
   "bank_account",
   "bank",
   "column_break_4",
+  "custom_delimiters",
+  "delimiter_options",
   "google_sheets_url",
   "refresh_google_sheet",
   "html_5",
   "import_file",
   "download_template",
-  "custom_delimiters",
-  "delimiter_options",
   "status",
   "template_options",
   "import_warnings_section",
@@ -212,6 +212,7 @@
  "hide_toolbar": 1,
  "links": [],
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
  "modified": "2022-09-07 11:11:40.293317",
 =======
@@ -220,6 +221,9 @@
 =======
  "modified": "2024-06-25 16:33:50.675848",
 >>>>>>> b202409428 (fix: remove deprecated field "statement_import_log")
+=======
+ "modified": "2024-06-25 17:32:07.658250",
+>>>>>>> 98ad01c736 (fix: field position)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Statement Import",