From a832d7b2d2b1640d7a80f9da900a0fb2917e88c2 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Thu, 11 May 2023 18:52:48 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/datums/supplypacks/voidsuits_vr.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm
index fc915527f6..df5c1861e9 100644
--- a/code/datums/supplypacks/voidsuits_vr.dm
+++ b/code/datums/supplypacks/voidsuits_vr.dm
@@ -139,11 +139,8 @@
 	cost = 150
 	containertype = /obj/structure/closet/crate/secure
 	name = "Solgov captain voidsuit crate"
-	access = access_captain
-<<<<<<< HEAD
-	
+	access = access_captain	
 // CHOMPStation EDIT End
-=======
 
 /datum/supply_pack/voidsuits/csc_breaker
 	name = "Shipbreaker's Industrial Suit (inc. jetpack)"
@@ -155,4 +152,3 @@
 	cost = 100
 	containertype = /obj/structure/closet/crate/secure
 	name = "Coyote Salvage Corp industrial voidsuit crate"
->>>>>>> 3596f94516... Merge pull request #14842 from KillianKirilenko/kk-coyotesuit