Update volume_pump.dm

2017-10-27 00:05:28 -05:00
parent ed12370a73
commit 2b699d8d73
1 changed files with 0 additions and 3 deletions
@@ -174,10 +174,7 @@ Thus, the two variables affect pump operation are set in New():
 	if(. && on && is_operational())
 		to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		return FALSE
-<<<<<<< HEAD
 	else
 		investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
 		message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [A]")
 		return
-=======
->>>>>>> e8c2109... Atmos construction rework again (#31944)