fix: conflicts

2023-06-13 11:22:59 +05:30
parent 7af03800c9
commit 2060a003c8
1 changed files with 1 additions and 12 deletions
--- 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,