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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-11-20 16:12:41 +05:30
committed by GitHub
parent a24733791d
commit e3b2cc24b2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,11 +254,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-03-12 16:34:51.326821",
=======
"modified": "2025-11-20 15:27:13.868179", "modified": "2025-11-20 15:27:13.868179",
>>>>>>> 20e0313a8c (fix: unhide zero val checkbox)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reconciliation Item", "name": "Stock Reconciliation Item",