From 06dd2e2aa5534d0273c7321538dbc2a1f6fc0ddc Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 17 Feb 2018 09:58:42 -0600
Subject: [PATCH] Update corpse.dm

---
 code/modules/awaymissions/corpse.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index f62d5ff15e..d57ea83e8f 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -181,15 +181,11 @@
 			var/obj/item/device/pda/PDA = locate(/obj/item/device/pda) in H
 			if(PDA)
 				PDA.toff = TRUE
-<<<<<<< HEAD
-=======
 		if(disable_sensors)
 			// Using crew monitors to find corpses while creative makes finding certain ruins too easy.
 			var/obj/item/clothing/under/C = H.wear_suit
 			if(C)
 				C.sensor_mode = NO_SENSORS
-
->>>>>>> b8b5084... Swaps locate for direct assignment
 	var/obj/item/card/id/W = H.wear_id
 	if(W)
 		if(id_access)