From 7aa0227ef8da3670783bea8ddf379b29ae079354 Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Mon, 26 Mar 2012 18:47:25 +0100
Subject: [PATCH] Another small merge fix.

---
 code/defines/obj/computer.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm
index c8e3442f934..82074ad7aa5 100644
--- a/code/defines/obj/computer.dm
+++ b/code/defines/obj/computer.dm
@@ -114,7 +114,7 @@
 
 /obj/machinery/computer/atmosphere/siphonswitch/mastersiphonswitch
 	name = "Master Air Control"
-
+	desc = "Emergancy global overrides for the entire atmospherics system."
 
 /obj/machinery/computer/dna
 	name = "DNA operations computer"