From 57ae028bfabe256acced11fe30dc799ae448ea1a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 28 Sep 2019 03:45:36 -0400
Subject: [PATCH] Update living.dm

---
 code/modules/mob/living/living.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index a2ea9809e22..3f4b648e6a3 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1281,11 +1281,7 @@ default behaviour is:
 			var/turf/end_T = get_turf(target)
 			if(end_T)
 				add_attack_logs(src,M,"Thrown via grab to [end_T.x],[end_T.y],[end_T.z]")
-<<<<<<< HEAD
-			src.drop_from_inventory(G)	//VOREStation Addition: grab exploit fix
-=======
 			src.drop_from_inventory(G)
->>>>>>> 2ec5dbb... Merge pull request #6463 from Heroman3003/grabfix
 
 	src.drop_from_inventory(item)
 	if(!item || !isturf(item.loc))
@@ -1367,4 +1363,4 @@ default behaviour is:
 		CLONE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=clone'>[getCloneLoss()]</a>
 		BRAIN:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=brain'>[getBrainLoss()]</a>
 		</font>
-		"}
\ No newline at end of file
+		"}