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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-04-02 22:23:22 +05:30
committed by GitHub
parent 5ea11af36b
commit 52c4157723
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/pick_list/pick_list.json
View File

@@ -204,11 +204,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-02-02 16:17:44.877426",
=======
"modified": "2024-03-27 22:49:16.954637", "modified": "2024-03-27 22:49:16.954637",
>>>>>>> 50dd9fa8a3 (feat: allow to pick manually qty / batches / serial nos)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Pick List", "name": "Pick List",