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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-07-08 08:34:16 +05:30
committed by GitHub
parent bb901cab88
commit 5f4aaed5a0
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
View File

@@ -188,11 +188,7 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-10-05 12:52:18.705431",
=======
"modified": "2025-07-07 15:51:29.329064", "modified": "2025-07-07 15:51:29.329064",
>>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Inventory Dimension", "name": "Inventory Dimension",
@@ -236,12 +232,7 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }