mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 07:54:46 +00:00
chore: fix conflicts
Updated the modified date for the delivery note item.
This commit is contained in:
@@ -951,11 +951,7 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
<<<<<<< HEAD
|
"modified": "2026-04-07 15:44:20.892151",
|
||||||
"modified": "2025-05-31 18:51:32.651562",
|
|
||||||
=======
|
|
||||||
"modified": "2026-04-07 15:43:20.892151",
|
|
||||||
>>>>>>> 90fd6f2e40 (fix: hardcoded precision causing decimal issues)
|
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Delivery Note Item",
|
"name": "Delivery Note Item",
|
||||||
|
|||||||
Reference in New Issue
Block a user