From 62011781fc2b48ab29a1e18ee70bb8eb9c5430d2 Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Sun, 8 Nov 2020 13:05:50 +0200
Subject: [PATCH] Update living.dm

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

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 10a41fbf45a..75179e2a3a6 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -33,10 +33,8 @@
 		buckled.unbuckle_mob(src, TRUE)
 
 	qdel(selected_image)
-<<<<<<< HEAD
 	QDEL_NULL(vorePanel) //VOREStation Add
 	QDEL_LIST_NULL(vore_organs) //VOREStation Add
-=======
 
 	if(LAZYLEN(organs))
 		organs_by_name.Cut()
@@ -52,7 +50,6 @@
 			internal_organs -= OR
 			qdel(OR)
 
->>>>>>> 68b370b... Fresh Meat, Leatherworking (#7629)
 	return ..()
 
 //mob verbs are faster than object verbs. See mob/verb/examine.
@@ -1486,4 +1483,4 @@ default behaviour is:
 // Tries to turn off things that let you see through walls, like mesons.
 // Each mob does vision a bit differently so this is just for inheritence and also so overrided procs can make the vision apply instantly if they call `..()`.
 /mob/living/proc/disable_spoiler_vision()
-	handle_vision()
\ No newline at end of file
+	handle_vision()