chore: fix conflicts

2026-02-16 08:05:00 +00:00 · 2025-03-31 15:05:10 +05:30
parent 64fdcb752d
commit 604b185bd3
1 changed files with 0 additions and 5 deletions
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -283,12 +283,7 @@
   "write": 1
  }
 ],
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
- "row_format": "Dynamic",
 "sort_field": "creation",
->>>>>>> 218dbd6911 (feat: option to recreate Stock Ledger Entries against stock transactions)
 "sort_order": "DESC",
 "states": []
 }