Update outlet_injector.dm

2017-12-30 13:23:02 -06:00
parent 70fea88a39
commit 35574263b1
1 changed files with 0 additions and 5 deletions
@@ -130,13 +130,8 @@

 	if("set_volume_rate" in signal.data)
 		var/number = text2num(signal.data["set_volume_rate"])
-<<<<<<< HEAD
-		var/datum/gas_mixture/air_contents = AIR1
-		volume_rate = Clamp(number, 0, air_contents.volume)
-=======
 		var/datum/gas_mixture/air_contents = airs[1]
 		volume_rate = CLAMP(number, 0, air_contents.volume)
->>>>>>> 6a7dbaa... removes silly garbage defines (#33621)

 	if("status" in signal.data)
 		spawn(2)