nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-03-31 12:42:51 +05:30
parent 85d8ed989d
commit 45eb440b68
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/production_plan/production_plan.json
View File

@@ -378,11 +378,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-03-25 09:15:25.017664", "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", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Plan", "name": "Production Plan",