CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-12 17:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
(cherry picked from commit 7f69556c45)
This commit is contained in:
rohitwaghchaure
2026-02-09 16:31:33 +05:30
committed by Mergify
parent fc48522e3d
commit 17076b3ce4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,11 +553,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
<<<<<<< HEAD
"modified": "2025-11-11 11:35:39.864923",
=======
"modified": "2026-02-09 15:01:12.466175",
>>>>>>> 376ab0e346 (feat: allow negative stock for the batch item)
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",