From e2d711540f6a277a111fde030052131d76351392 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Wed, 15 Jan 2025 18:17:04 +0530
Subject: [PATCH] chore: fix conflicts

---
 erpnext/stock/doctype/serial_no/serial_no.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 3ed4289ca96..89c77d46b1e 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -272,11 +272,7 @@
  "icon": "fa fa-barcode",
  "idx": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-12-17 10:52:55.767839",
-=======
- "modified": "2025-01-15 15:22:49.873889",
->>>>>>> 9607b16dcf (fix: status of the serial no for the raw materials)
+ "modified": "2025-01-15 16:22:49.873889",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial No",
@@ -320,4 +316,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}