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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-07-09 20:44:57 +05:30
committed by GitHub
parent 902a3c5c55
commit cef69b05a9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -898,11 +898,7 @@
"image_field": "image",
"links": [],
"make_attachments_public": 1,
<<<<<<< HEAD
"modified": "2026-03-17 20:39:05.218344",
=======
"modified": "2026-07-05 23:24:45.734144",
>>>>>>> 54da9fc27a (fix: update modified timestamp in item.json)
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",