CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-12-04 12:48:50 +05:30
committed by GitHub
parent 1427b4ac3f
commit bd00a484ea
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

@@ -894,11 +894,7 @@
"image_field": "image", "image_field": "image",
"links": [], "links": [],
"make_attachments_public": 1, "make_attachments_public": 1,
<<<<<<< HEAD
"modified": "2025-08-08 14:58:48.674193",
=======
"modified": "2025-12-04 09:11:56.029567", "modified": "2025-12-04 09:11:56.029567",
>>>>>>> 70521fb9bf (fix: remove set_only_once from is_fixed_asset)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",