From 98ed6445a8e121e613ac7618f60a7558500c5555 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sun, 16 Apr 2023 20:10:18 +0530 Subject: [PATCH] chore: `conflicts` --- erpnext/stock/doctype/serial_no/serial_no.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 31170f8454d..975c87024eb 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -434,11 +434,7 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], -<<<<<<< HEAD - "modified": "2021-01-08 14:31:15.375996", -======= "modified": "2023-04-14 15:58:46.139887", ->>>>>>> fb3271c624 (fix: unable to change `company` for manual `Serial No` entry) "modified_by": "Administrator", "module": "Stock", "name": "Serial No",