From 52c4157723663e638068493fb15c0208e9f8531d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 2 Apr 2024 22:23:22 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/pick_list/pick_list.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json index 927d1a61edc..0e466e44d1b 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.json +++ b/erpnext/stock/doctype/pick_list/pick_list.json @@ -204,11 +204,7 @@ ], "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-02-02 16:17:44.877426", -======= "modified": "2024-03-27 22:49:16.954637", ->>>>>>> 50dd9fa8a3 (feat: allow to pick manually qty / batches / serial nos) "modified_by": "Administrator", "module": "Stock", "name": "Pick List",