Update server.dm

2017-11-22 14:20:45 -05:00
parent 61ae95da33
commit b925c0e265
1 changed files with 0 additions and 5 deletions
@@ -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