From 447485ae909df20b1c52012186e4a04056caaabc Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 20 Oct 2022 15:01:22 +0530 Subject: [PATCH] fix: conflicts --- erpnext/manufacturing/doctype/bom/test_bom.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py index 0c59ca1e75e..16280fc8106 100644 --- a/erpnext/manufacturing/doctype/bom/test_bom.py +++ b/erpnext/manufacturing/doctype/bom/test_bom.py @@ -9,16 +9,8 @@ import frappe from frappe.tests.utils import FrappeTestCase from frappe.utils import cstr, flt -<<<<<<< HEAD from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order from erpnext.manufacturing.doctype.bom.bom import BOMRecursionError, item_query -======= -from erpnext.controllers.tests.test_subcontracting_controller import ( - make_stock_in_entry, - set_backflush_based_on, -) -from erpnext.manufacturing.doctype.bom.bom import BOMRecursionError, item_query, make_variant_bom ->>>>>>> 9cfe527492 (fix: BOM cost update message) from erpnext.manufacturing.doctype.bom_update_log.test_bom_update_log import ( update_cost_in_all_boms_in_test, )