From 2060a003c87264a0601bf575898d0d36e881a29d Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 13 Jun 2023 11:22:59 +0530
Subject: [PATCH] fix: conflicts

---
 .../manufacturing/doctype/job_card/job_card.json    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json
index 3cd1f54b69e..dc0213a7bcd 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.json
+++ b/erpnext/manufacturing/doctype/job_card/job_card.json
@@ -436,23 +436,12 @@
    "fieldname": "expected_end_date",
    "fieldtype": "Datetime",
    "label": "Expected End Date"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "serial_and_batch_bundle",
-   "fieldtype": "Link",
-   "label": "Serial and Batch Bundle",
-   "no_copy": 1,
-   "options": "Serial and Batch Bundle",
-   "print_hide": 1
   },
   {
    "fieldname": "process_loss_qty",
    "fieldtype": "Float",
    "label": "Process Loss Qty",
    "read_only": 1
->>>>>>> e9a6191af9 (fix: added process loss in job card)
   }
  ],
  "is_submittable": 1,
@@ -515,4 +504,4 @@
  "states": [],
  "title_field": "operation",
  "track_changes": 1
-}
\ No newline at end of file
+}