From b996d9353aada11fbde2187bb536d5f1b3468ddf Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 18 Feb 2018 18:29:04 -0500
Subject: [PATCH] Update autolathe_designs.dm

---
 code/modules/research/designs/autolathe_designs.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index e3fc8d2513..90be65bc53 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -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)"