[fix] [minor] merge conflict fix
diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
index 5707665..a5ff125 100644
--- a/manufacturing/doctype/bom/bom.txt
+++ b/manufacturing/doctype/bom/bom.txt
@@ -120,24 +120,18 @@
"options": "Price List"
},
{
-<<<<<<< HEAD
-=======
"depends_on": "with_operations",
->>>>>>> 4e677a3f5235c96e86c5fe5acd8d2f59dff895dc
"description": "Specify the operations, operating cost and give a unique Operation no to your operations.",
"doctype": "DocField",
"fieldname": "operations",
"fieldtype": "Section Break",
- "hidden": 0,
"label": "Operations",
"oldfieldtype": "Section Break"
},
{
- "depends_on": "with_operations",
"doctype": "DocField",
"fieldname": "bom_operations",
"fieldtype": "Table",
- "hidden": 0,
"label": "BOM Operations",
"oldfieldname": "bom_operations",
"oldfieldtype": "Table",