From f0dad52aaa51f495812ed341881da905fdad0df9 Mon Sep 17 00:00:00 2001
From: Akhilesh Darjee <akhileshdarjee@gmail.com>
Date: Tue, 10 Dec 2013 18:11:31 +0530
Subject: [PATCH] [fix] [minor] merge conflict fix

---
 manufacturing/doctype/bom/bom.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
index 57076654df..a5ff125293 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",