Update pump.dm

2017-10-17 07:46:18 -05:00
parent 35c80edc7a
commit a07871c9de
1 changed files with 0 additions and 1 deletions
@@ -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)