From ebdb23bdda585e3148b70bc3e92210d46f8b7215 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 16 Jun 2026 20:37:19 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/stock/doctype/batch/batch.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json index 8fdf8ae5055..e318f113713 100644 --- a/erpnext/stock/doctype/batch/batch.json +++ b/erpnext/stock/doctype/batch/batch.json @@ -209,11 +209,7 @@ "image_field": "image", "links": [], "max_attachments": 5, -<<<<<<< HEAD - "modified": "2023-11-09 12:17:28.339975", -======= "modified": "2026-06-16 16:01:26.556324", ->>>>>>> 62f6d18143 (fix(stock): show only batched items in batch item selector) "modified_by": "Administrator", "module": "Stock", "name": "Batch",