Revert "fix: Test"
This reverts commit feed97ec53767e777b8a638d5a8e3ffc0a04e500.
diff --git a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py
index f178492..2448e17 100644
--- a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py
+++ b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py
@@ -60,7 +60,6 @@
rm_item = [
{
'name': po.supplied_items[0].name,
-<<<<<<< HEAD
'item_code': item_1,
'rm_item_code': item_1,
'item_name': item_1,
@@ -68,20 +67,10 @@
'warehouse': '_Test Warehouse - _TC',
'rate': 100,
'amount': 100 * transfer_qty_map[item_1],
-=======
- 'item_code': '_Test Item Home Desktop 100',
- 'rm_item_code': '_Test Item Home Desktop 100',
- 'item_name': '_Test Item Home Desktop 100',
- 'qty': 2,
- 'warehouse': '_Test Warehouse - _TC',
- 'rate': 100,
- 'amount': 200,
->>>>>>> c4d851e45f (fix: Test)
'stock_uom': 'Nos'
},
{
'name': po.supplied_items[1].name,
-<<<<<<< HEAD
'item_code': item_2,
'rm_item_code': item_2,
'item_name': item_2,
@@ -89,15 +78,6 @@
'warehouse': '_Test Warehouse - _TC',
'rate': 100,
'amount': 100 * transfer_qty_map[item_2],
-=======
- 'item_code': '_Test Item',
- 'rm_item_code': '_Test Item',
- 'item_name': '_Test Item',
- 'qty': 1,
- 'warehouse': '_Test Warehouse - _TC',
- 'rate': 100,
- 'amount': 100,
->>>>>>> c4d851e45f (fix: Test)
'stock_uom': 'Nos'
}
]