nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-18 20:00:08 +05:30
committed by GitHub
parent 8306d6fdb6
commit 0acdae02c1
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/packed_item/packed_item.json
View File

@@ -296,11 +296,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-02-18 13:07:02.789654",
"modified": "2024-02-04 16:30:44.263964",
=======
"modified": "2025-02-18 13:06:02.789654",
>>>>>>> 8cfab57fc8 (fix: slow query)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Packed Item", "name": "Packed Item",
@@ -310,4 +306,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }