From b6ed0698b4d23e35d0d3d5e32d448c501a6a3370 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Tue, 3 Jan 2023 22:56:58 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/stock/doctype/stock_entry/stock_entry.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 71f2b73c670..ef2c28580c3 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/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