From 5efeb2af18e30b82ae6f1d6e161e6328fbe40b32 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 8 Jun 2026 15:30:48 +0530 Subject: [PATCH] chore: fix conflicts Removed unused import for StockReconciliationItem. --- .../doctype/stock_reconciliation/stock_reconciliation.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 78037bad8a0..0a2e91f2a32 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -17,12 +17,7 @@ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle impor get_available_serial_nos, ) from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos -<<<<<<< HEAD -from erpnext.stock.utils import get_combine_datetime, get_incoming_rate, get_stock_balance -======= -from erpnext.stock.doctype.stock_reconciliation_item.stock_reconciliation_item import StockReconciliationItem from erpnext.stock.utils import get_incoming_rate, get_stock_balance ->>>>>>> e36426e235 (fix: do not allow to make changes in SABB after submit) class OpeningEntryAccountError(frappe.ValidationError):