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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-03-01 12:53:44 +05:30
committed by GitHub
parent 87703c6511
commit 93fed0ce86
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/stock_settings/stock_settings.json
View File

@@ -497,11 +497,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-02-17 14:36:36.177743",
=======
"modified": "2025-02-28 15:08:35.938840",
>>>>>>> 93f461c6f3 (fix: rearrange stock settings fields)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",