From 223ffff44dee30cd20866c39b25ec0513a8be589 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 18 Nov 2022 03:50:08 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/datums/supplypacks/misc_vr.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm
index df85a3369e..8118ff0ab1 100644
--- a/code/datums/supplypacks/misc_vr.dm
+++ b/code/datums/supplypacks/misc_vr.dm
@@ -161,8 +161,6 @@
 	cost = 300
 	containertype = /obj/structure/closet/crate
 	containername = "cordless jukebox speakers crate"
-<<<<<<< HEAD
-=======
 
 /datum/supply_pack/misc/explorer_headsets
 	name = "shortwave-capable headsets (x4)"
@@ -178,4 +176,3 @@
 		access_pilot
 	)
 	one_access = TRUE
->>>>>>> 1657a7f62a... Merge pull request #14092 from KillianKirilenko/kk-cargo