Replaces "console screen" stock part with glass sheets

code/modules/research/designs/autolathe_designs.dm

@@ -123,14 +123,6 @@
 	build_path = /obj/item/storage/toolbox
 	category = list("initial","Tools")
 
-/datum/design/console_screen
-	name = "Console Screen"
-	id = "console_screen"
-	build_type = AUTOLATHE
-	materials = list(MAT_GLASS = 200)
-	build_path = /obj/item/stock_parts/console_screen
-	category = list("initial", "Electronics")
-
 /datum/design/apc_board
 	name = "APC Module"
 	id = "power control"

code/modules/research/stock_parts.dm

@@ -82,6 +82,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
 
 //Rating 1
 
+<<<<<<< HEAD
 /obj/item/stock_parts/console_screen
 	name = "console screen"
 	desc = "Used in the construction of computers and other devices with an interactive console."
@@ -89,6 +90,8 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
 	origin_tech = "materials=1"
 	materials = list(MAT_GLASS=200)
 
+=======
+>>>>>>> 4c909b5... Replaces "console screen" stock part with glass sheets (#33018)
 /obj/item/stock_parts/capacitor
 	name = "capacitor"
 	desc = "A basic capacitor used in the construction of a variety of devices."