nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-15 23:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-07-29 21:02:04 +05:30
committed by GitHub
parent f8ea431551
commit 184cabdcb0
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
View File

@@ -70,11 +70,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2021-09-14 01:20:48.588052",
=======
"modified": "2025-07-29 13:09:57.323835",
>>>>>>> c18d565d3e (fix: change modified timestamp so migrations work)
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card Scrap Item",
@@ -84,4 +80,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
}