fixes flametrowers not being buildiable in the autolathe

2018-02-17 12:33:22 +01:00
parent 7fe1c87666
commit f4be7d0f5b
1 changed files with 4 additions and 0 deletions
@@ -590,7 +590,11 @@
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 500)
 	build_path = /obj/item/flamethrower/full
+<<<<<<< HEAD
 	category = list("hacked", "Weapons and ammo")
+=======
+	category = list("hacked", "Security")
+>>>>>>> 9f7e379... bad copypaste

 /datum/design/rcd
 	name = "Rapid Construction Device (RCD)"