From 7ef0c6bb015166163447d3c463fd04351f699fc6 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 20 Dec 2022 11:55:22 +0530 Subject: [PATCH] fix: conflict --- 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 5cf2a556ee2..c38b3d997a3 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, today -from six import iteritems -======= from frappe.utils import add_days, flt, now, nowdate, nowtime, today ->>>>>>> f31612376a (test: added test case to validate audit for incorrect entries) +from six import iteritems from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.stock.doctype.item.test_item import (