From a07871c9de49b6d423f9a96183be88f7401b3e0e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 17 Oct 2017 07:46:18 -0500 Subject: [PATCH] Update pump.dm --- code/modules/atmospherics/machinery/portable/pump.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 388e957c08..3f2bceaa04 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -1,6 +1,5 @@ #define PUMP_OUT "out" #define PUMP_IN "in" -<<<<<<< HEAD #define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25) #define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10) #define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE)