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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-12-24 15:06:48 +05:30
committed by GitHub
parent 4753594a26
commit 35ae839ab7
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/serial_no/serial_no.json
View File

@@ -283,11 +283,7 @@
"icon": "fa fa-barcode", "icon": "fa fa-barcode",
"idx": 1, "idx": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-07-15 13:40:21.938700",
=======
"modified": "2025-12-24 14:30:43.599590", "modified": "2025-12-24 14:30:43.599590",
>>>>>>> 23c70332df (perf: index for warehouse field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial No", "name": "Serial No",