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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-03-02 21:39:36 +05:30
committed by GitHub
parent 0766c0ea43
commit 6f164cb183
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_entry_detail/stock_entry_detail.json
View File

@@ -617,11 +617,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2025-10-14 15:10:38.373099",
=======
"modified": "2026-03-02 14:05:23.116017",
>>>>>>> 8c94396ad9 (perf: add index on reference_purchase_receipt column)
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",