chore: resolve conflicts

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -10,7 +10,6 @@ from frappe import _
 from frappe.model.mapper import get_mapped_doc
 from frappe.query_builder.functions import Sum
 from frappe.utils import (
-	add_days,
 	cint,
 	comma_or,
 	cstr,
@@ -19,7 +18,6 @@ from frappe.utils import (
 	formatdate,
 	getdate,
 	nowdate,
-	today,
 )
 from six import iteritems, itervalues, string_types