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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-17 12:13:33 +05:30
committed by GitHub
parent d6333c1562
commit e8b46d9815
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/manufacturing/doctype/plant_floor/plant_floor.json
View File

@@ -74,11 +74,7 @@
"hide_toolbar": 1, "hide_toolbar": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-09-19 19:06:36.481625",
=======
"modified": "2026-02-17 11:53:17.940039", "modified": "2026-02-17 11:53:17.940039",
>>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Plant Floor", "name": "Plant Floor",
@@ -98,12 +94,7 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }