From 4d11a9c884f2b6d0940e43de4f1ee75add03a202 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Sun, 14 Jan 2024 10:32:10 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../stock_reconciliation_item.json            | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
index 0c0d7e87379..e3cd34725b8 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -188,30 +188,6 @@
    "fieldtype": "Data",
    "label": "Has Item Scanned",
    "read_only": 1
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "serial_and_batch_bundle",
-   "fieldtype": "Link",
-   "label": "Serial / Batch Bundle",
-   "no_copy": 1,
-   "options": "Serial and Batch Bundle",
-   "print_hide": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "current_serial_and_batch_bundle",
-   "fieldtype": "Link",
-   "label": "Current Serial / Batch Bundle",
-   "no_copy": 1,
-   "options": "Serial and Batch Bundle",
-   "read_only": 1
-  },
-  {
-   "fieldname": "add_serial_batch_bundle",
-   "fieldtype": "Button",
-   "label": "Add Serial / Batch No"
   },
   {
    "fetch_from": "item_code.item_group",
@@ -219,16 +195,11 @@
    "fieldtype": "Link",
    "label": "Item Group",
    "options": "Item Group"
->>>>>>> 116ff8241c (fix: added item group in stock reco)
   }
  ],
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-07-25 11:58:44.992419",
-=======
  "modified": "2024-01-14 10:04:23.599951",
->>>>>>> 116ff8241c (fix: added item group in stock reco)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reconciliation Item",
@@ -239,4 +210,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}