From 8c9168595f23463ebf0635983105e601f823223c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 5 Jun 2026 20:48:19 +0530 Subject: [PATCH] chore: fix conflicts Removed unused import of DateTimeLikeObject. --- erpnext/stock/doctype/batch/batch.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index 324865fc308..6b2b1360cf9 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -10,12 +10,7 @@ from frappe.model.document import Document from frappe.model.naming import make_autoname, revert_series_if_last from frappe.query_builder.functions import CurDate, Sum from frappe.utils import cint, flt, get_link_to_form -<<<<<<< HEAD from frappe.utils.data import add_days -from frappe.utils.jinja import render_template -======= -from frappe.utils.data import DateTimeLikeObject, add_days ->>>>>>> 3a50056968 (fix: naming series issue) class UnableToSelectBatchError(frappe.ValidationError):