nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 07:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-06-26 13:46:30 +05:30
committed by GitHub
parent 9e6edea818
commit f2b7319462
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
View File

@@ -35,11 +35,7 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-02-19 20:33:30.657406",
=======
"modified": "2026-06-19 10:55:00.000000", "modified": "2026-06-19 10:55:00.000000",
>>>>>>> adfef48a65 (fix: allow rename for Quality Inspection Parameter)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Quality Inspection Parameter", "name": "Quality Inspection Parameter",