From f232024fa453b2c562d02c0ee5abd9dac1f4a54c Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 17 Mar 2026 15:23:05 +0530
Subject: [PATCH] chore: remove incorrect import

(cherry picked from commit fc2edfbdedb59077d105b82d4bd1b00784cec57a)

# Conflicts:
#	erpnext/controllers/queries.py
---
 erpnext/controllers/queries.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 12d5229c9f3..97b2680d968 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -607,9 +607,13 @@ def get_blanket_orders(doctype, txt, searchfield, start, page_len, filters):
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
+<<<<<<< HEAD
 def get_income_account(doctype, txt, searchfield, start, page_len, filters):
 	from erpnext.controllers.queries import get_match_cond
 
+=======
+def get_income_account(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
+>>>>>>> fc2edfbded (chore: remove incorrect import)
 	# income account can be any Credit account,
 	# but can also be a Asset account with account_type='Income Account' in special circumstances.
 	# Hence the first condition is an "OR"
@@ -695,9 +699,13 @@ def get_filtered_dimensions(doctype, txt, searchfield, start, page_len, filters,
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
+<<<<<<< HEAD
 def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
 	from erpnext.controllers.queries import get_match_cond
 
+=======
+def get_expense_account(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
+>>>>>>> fc2edfbded (chore: remove incorrect import)
 	if not filters:
 		filters = {}