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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-03-18 12:01:11 +05:30
committed by GitHub
parent 34d6e4bdaa
commit e8047ab2ca
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/item_default/item_default.json
View File

@@ -140,11 +140,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-09-04 12:33:14.607267",
=======
"modified": "2025-03-17 13:46:09.719105", "modified": "2025-03-17 13:46:09.719105",
>>>>>>> d758fde881 (fix: performance issue for item list view)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item Default", "name": "Item Default",
@@ -155,4 +151,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }