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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-03-31 15:05:10 +05:30
committed by GitHub
parent 64fdcb752d
commit 604b185bd3
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
View File

@@ -283,12 +283,7 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
>>>>>>> 218dbd6911 (feat: option to recreate Stock Ledger Entries against stock transactions)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }