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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-04-11 20:26:43 +05:30
committed by GitHub
parent b8436dbd21
commit fa7675488d
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

@@ -509,11 +509,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-03-31 15:34:20.752065",
=======
"modified": "2025-04-11 18:56:35.781929", "modified": "2025-04-11 18:56:35.781929",
>>>>>>> 00b25537f4 (fix: removed display depends on)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",