From abfe3c83656029a422adf85845d5694f2e366eaa Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 30 Jun 2025 12:45:04 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../doctype/work_order/work_order.json        | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index 06fe1977b52..f1735ab64b5 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -586,25 +586,7 @@
   },
   {
    "fieldname": "section_break_ndpq",
-<<<<<<< HEAD
    "fieldtype": "Section Break"
-=======
-   "fieldtype": "Section Break",
-   "label": "Required Items"
-  },
-  {
-   "default": "0",
-   "fetch_from": "bom_no.track_semi_finished_goods",
-   "fieldname": "track_semi_finished_goods",
-   "fieldtype": "Check",
-   "label": "Track Semi Finished Goods",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "reserve_stock",
-   "fieldtype": "Check",
-   "label": " Reserve Stock"
   },
   {
    "depends_on": "eval:doc.docstatus==1",
@@ -613,7 +595,6 @@
    "label": "Disassembled Qty",
    "no_copy": 1,
    "read_only": 1
->>>>>>> 3e4d160626 (fix: disassemble qty calculation & max calculation to be allowed to create it)
   }
  ],
  "icon": "fa fa-cogs",
@@ -621,11 +602,7 @@
  "image_field": "image",
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-11 15:47:13.454422",
-=======
  "modified": "2025-06-21 00:55:45.916224",
->>>>>>> 3e4d160626 (fix: disassemble qty calculation & max calculation to be allowed to create it)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Work Order",
@@ -661,4 +638,4 @@
  "title_field": "production_item",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}