From ca7b15c0a3a725d8c38f659c60c917f5b2f5bd85 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 20 Mar 2022 18:57:54 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../preference_setup/loadout/loadout_utility_vr.dm       | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
index 2865d242b1..479032897e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
@@ -74,12 +74,3 @@
 	display_name = "bluespace bracelet"
 	path = /obj/item/clothing/gloves/bluespace
 	cost = 5
-<<<<<<< HEAD
-
-/datum/gear/utility/satchel_strapless
-	display_name = "satchel strapless"
-	path = /obj/item/weapon/storage/backpack/satchel/strapless
-	slot = slot_back
-	cost = 1
-=======
->>>>>>> a23bb91159... Merge pull request #12466 from BonniePandora/Strap-on,-more-like-strap-off