nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
Sagar Sharma
2023-05-23 10:54:27 +05:30
committed by GitHub
parent f63b866de3
commit 8d97f8b0b7
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/job_card/job_card.json
View File

@@ -420,15 +420,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2021-11-12 10:15:06.572401",
=======
"modified": "2023-05-22 23:26:57.589331", "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", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Job Card", "name": "Job Card",