From 9aeb08f968888bdb9a73ca2832a5d4b303da5fe3 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 15 Jul 2025 15:03:41 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/serial_no/serial_no.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 021847d5fa5..924277b30ea 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -282,11 +282,7 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-01-15 16:22:49.873889", -======= - "modified": "2025-07-15 13:36:21.938700", ->>>>>>> e073075834 (fix: system was allowing credit notes with serial numbers for any customer) + "modified": "2025-07-15 13:40:21.938700", "modified_by": "Administrator", "module": "Stock", "name": "Serial No",