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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-03-31 20:43:34 +05:30
committed by GitHub
parent 288aad6f5d
commit 2b854377b1
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/stock_settings/stock_settings.json
View File

@@ -510,11 +510,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-02-28 16:08:35.938840",
=======
"modified": "2025-03-31 15:34:20.752065", "modified": "2025-03-31 15:34:20.752065",
>>>>>>> b1dfbbe85e (feat: allow UOMs to select for which converstion rate defined in item master)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",
@@ -535,12 +531,7 @@
} }
], ],
"quick_entry": 1, "quick_entry": 1,
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
>>>>>>> b1dfbbe85e (feat: allow UOMs to select for which converstion rate defined in item master)
"sort_order": "ASC", "sort_order": "ASC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1