fix: conflicts

frappe · Jun 13, 2023 · 2060a00 · 2060a00
1 parent 7af0380
commit 2060a00
Showing 1 changed file with 1 addition and 12 deletions.
diff --git 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
-}
+}