From 4fcd6aac6edf12b50264fe8b38ed355fc611f8a6 Mon Sep 17 00:00:00 2001
From: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
Date: Thu, 9 May 2024 15:11:32 +0530
Subject: [PATCH] Update inventory.dm

---
 code/modules/mob/inventory.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 4b6e5c6ce9a..11dfee3b643 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -468,11 +468,6 @@
 	if(user.active_storage?.attempt_insert(src, user, messages = FALSE))
 		return TRUE
 
-<<<<<<< HEAD
-	var/list/obj/item/possible = list(M.get_inactive_held_item(), M.get_item_by_slot(ITEM_SLOT_BELT), M.get_item_by_slot(ITEM_SLOT_DEX_STORAGE), M.get_item_by_slot(ITEM_SLOT_BACK))
-	for(var/i in possible)
-		if(!i)
-=======
 	var/list/obj/item/possible = list(
 		user.get_inactive_held_item(),
 		user.get_item_by_slot(ITEM_SLOT_BELT),
@@ -481,7 +476,6 @@
 	)
 	for(var/thing in possible)
 		if(isnull(thing))
->>>>>>> 177a2edfe59 (Quick equip no longer throws balloon alerts (#83117))
 			continue
 		var/obj/item/gear = thing
 		if(gear.atom_storage?.attempt_insert(src, user, messages = FALSE))