From 8d97f8b0b73f6e2614b275edf5a608fec9379093 Mon Sep 17 00:00:00 2001 From: Sagar Sharma Date: Tue, 23 May 2023 10:54:27 +0530 Subject: [PATCH] chore: `conflicts` --- erpnext/manufacturing/doctype/job_card/job_card.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json index 3d2467b113c..43dc5c0b7be 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.json +++ b/erpnext/manufacturing/doctype/job_card/job_card.json @@ -420,15 +420,7 @@ ], "is_submittable": 1, "links": [], -<<<<<<< HEAD -<<<<<<< HEAD - "modified": "2021-11-12 10:15:06.572401", -======= "modified": "2023-05-22 23:26:57.589331", ->>>>>>> a209fb4b64 (fix: error while saving job card) -======= - "modified": "2023-05-23 09:56:43.826602", ->>>>>>> 8c34cc0e00 (fix: use flt instead of mandatory field) "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card",