From 62959e5a700b6656ef4274d1a17289c4be70b598 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 26 Sep 2025 11:21:16 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/controllers/subcontracting_controller.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index 1c08d20c13d..da03f907e3b 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -12,12 +12,8 @@ from frappe.utils import cint, flt, get_link_to_form from erpnext.controllers.stock_controller import StockController from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( -<<<<<<< HEAD -======= - combine_datetime, get_auto_batch_nos, get_available_serial_nos, ->>>>>>> 23f9d4c600 (fix: auto batch not set for raw materials in subcontracting receipt) get_voucher_wise_serial_batch_from_bundle, ) from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos