chore: fix conflicts

2025-01-15 18:17:04 +05:30
parent d956051e69
commit e2d711540f
1 changed files with 2 additions and 6 deletions
--- 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
-}
+}