chore: fix conflicts

2026-03-20 10:45:29 +00:00 · 2025-07-08 08:33:33 +05:30
parent ed77c15ebc
commit 5df8ad6ef1
1 changed files with 0 additions and 5 deletions
--- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
+++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
@@ -224,12 +224,7 @@
   "role": "Stock User"
  }
 ],
-<<<<<<< HEAD
 "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
 "sort_order": "DESC",
 "states": []
 }