From 41b8563b7ad201a2d8bbf43a6153b64d48f5db43 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 17 Aug 2022 14:47:47 +0530 Subject: [PATCH] fix: conflicts --- erpnext/stock/doctype/stock_entry/test_stock_entry.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index be2409ddf61..64ea0435e16 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -5,12 +5,8 @@ import frappe from frappe.permissions import add_user_permission, remove_user_permission from frappe.tests.utils import FrappeTestCase, change_settings -<<<<<<< HEAD -from frappe.utils import add_days, flt, nowdate, nowtime -from six import iteritems -======= from frappe.utils import add_days, flt, nowdate, nowtime, today ->>>>>>> 795c94384a (fix: not able to issue expired batches) +from six import iteritems from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.stock.doctype.item.test_item import (