From 75253b9932822e1fca537c8f698139a101220fe8 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sun, 7 Dec 2025 11:46:04 +0530 Subject: [PATCH] chore: fix conflicts --- .../doctype/inventory_dimension/test_inventory_dimension.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py index 9ebd41e1a8d..75beebb59ff 100644 --- a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py +++ b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py @@ -3,11 +3,7 @@ import frappe from frappe.custom.doctype.custom_field.custom_field import create_custom_field -<<<<<<< HEAD -from frappe.tests.utils import FrappeTestCase -======= -from frappe.tests import IntegrationTestCase, change_settings ->>>>>>> 1e2c56874f (test: validate negative stock with multiple inventory dimensions) +from frappe.tests.utils import FrappeTestCase, change_settings from frappe.utils import nowdate, nowtime from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note