From 8521e12753aeb7a423a5bb0ba89ab365255ff7fb Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 30 Dec 2022 14:35:12 +0530 Subject: [PATCH] fix: conflicts --- erpnext/stock/doctype/stock_entry/test_stock_entry.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 820491b6c85..4fe3cc1fdab 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, now, nowdate, nowtime, today from six import iteritems -======= -from frappe.utils import add_days, flt, nowdate, nowtime, today ->>>>>>> 728dc1acf4 (Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation") from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.stock.doctype.item.test_item import (