From 45eb440b682a4f992a2081795d42fdf5d4b6dd26 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Fri, 31 Mar 2023 12:42:51 +0530 Subject: [PATCH] chore: `conflicts` --- .../doctype/production_plan/production_plan.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.json b/erpnext/manufacturing/doctype/production_plan/production_plan.json index 3af28170a66..23b32379413 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.json +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.json @@ -378,11 +378,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD "modified": "2022-03-25 09:15:25.017664", -======= - "modified": "2023-03-31 10:30:48.118932", ->>>>>>> 706be2a415 (chore: make `Production Plan Item Reference` table hidden in Production Plan) "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan",