From 55e49514453e09e4e743e484fd316586663d5c57 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Wed, 29 Nov 2023 12:25:16 +0530 Subject: [PATCH] chore: `conflicts` --- erpnext/controllers/tests/test_subcontracting_controller.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py index 454eca905c5..68af142afcb 100644 --- a/erpnext/controllers/tests/test_subcontracting_controller.py +++ b/erpnext/controllers/tests/test_subcontracting_controller.py @@ -957,12 +957,8 @@ def make_raw_materials(): "batch_number_series": "BAT.####", }, "Subcontracted SRM Item 4": {"has_serial_no": 1, "serial_no_series": "SRII.####"}, -<<<<<<< HEAD "Subcontracted SRM Item 5": {"has_serial_no": 1, "serial_no_series": "SRII.####"}, -======= - "Subcontracted SRM Item 5": {"has_serial_no": 1, "serial_no_series": "SRIID.####"}, "Subcontracted SRM Item 8": {}, ->>>>>>> fddf341f44 (fix: incorrect ordered qty for Subcontracting Order (#38415)) } for item, properties in raw_materials.items():