nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-02-16 14:01:17 +05:30
parent d7831685af
commit 2fdf6ab164
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/item/item.json
View File

@@ -911,11 +911,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"make_attachments_public": 1, "make_attachments_public": 1,
<<<<<<< HEAD
"modified": "2022-09-13 04:08:17.431731",
=======
"modified": "2023-02-14 04:48:26.343620", "modified": "2023-02-14 04:48:26.343620",
>>>>>>> 4d79ffe3c6 (fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",