From c73797662f8ae0048da056ce3236293d4a7f9e45 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 14 Feb 2021 07:16:39 -0500
Subject: [PATCH] Update engineering.dm

---
 code/modules/research/designs/engineering.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/research/designs/engineering.dm b/code/modules/research/designs/engineering.dm
index 3fd0c0af9d..6a6dbc4e16 100644
--- a/code/modules/research/designs/engineering.dm
+++ b/code/modules/research/designs/engineering.dm
@@ -48,11 +48,8 @@
 	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, "silver" = 300, "phoron" = 300, "diamond" = 500) //Probably change the price in the future just put something for now
 	build_path = /obj/item/weapon/rms
 	sort_string = "NAAAB"
-
-<<<<<<< HEAD
 // YW addition end
-||||||| parent of f4442f6080... Merge pull request #9017 from ShadowLarkens/rpd_obtainable
-=======
+
 /datum/design/item/tool/rpd
 	name = "Rapid Pipe Dispenser"
 	desc = "A counterpart to the rapid construction device that allows creating and placing atmospheric and disposal pipes."
@@ -62,7 +59,6 @@
 	build_path = /obj/item/weapon/pipe_dispenser
 	sort_string = "NAAAD"
 
->>>>>>> f4442f6080... Merge pull request #9017 from ShadowLarkens/rpd_obtainable
 // Other devices
 
 /datum/design/item/engineering/AssembleDesignName()