Update autolathe_designs.dm

2018-02-18 18:29:04 -05:00
parent f4be7d0f5b
commit b996d9353a
1 changed files with 0 additions and 4 deletions
@@ -590,11 +590,7 @@
 	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)"