From b925c0e2656a24b4aa8074e418e4045a9e9387d3 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 22 Nov 2017 14:20:45 -0500
Subject: [PATCH] Update server.dm

---
 code/modules/research/server.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index f0e7ee0668..9a59e63e18 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
 /obj/machinery/r_n_d/server
-	name = "R&D Server"
-=======
-/obj/machinery/rnd/server
 	name = "\improper R&D Server"
 	desc = "A computer system running a deep neural network that processes arbitrary information to produce data useable in the development of new technologies. In layman's terms, it makes research points."
->>>>>>> 5d9231a... Gives the R&D Server a description and makes its name improper (#32955)
 	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "server"
 	var/datum/research/files