From 501bff423fa88819e04c8bf93f20a45227f444b5 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 22 Jan 2022 09:17:12 -0500
Subject: [PATCH 1/2] sword fix attempt three

---
 code/datums/supplypacks/misc_vr.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm
index ab9710a7bc..bfaee75de4 100644
--- a/code/datums/supplypacks/misc_vr.dm
+++ b/code/datums/supplypacks/misc_vr.dm
@@ -173,3 +173,7 @@
 
 	one_access = TRUE
 	containername = "sword crate"
+<<<<<<< HEAD
+=======
+	containertype = /obj/structure/closet/crate/secure/gear
+>>>>>>> b084c69bd3c... Merge pull request #12086 from TheDavestDave/sword-3

From 05f5e75b26899d8db6578dd39309f1174d4fb1da Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 22 Jan 2022 10:43:43 -0500
Subject: [PATCH 2/2] 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 bfaee75de4..b3263590ca 100644
--- a/code/datums/supplypacks/misc_vr.dm
+++ b/code/datums/supplypacks/misc_vr.dm
@@ -173,7 +173,4 @@
 
 	one_access = TRUE
 	containername = "sword crate"
-<<<<<<< HEAD
-=======
 	containertype = /obj/structure/closet/crate/secure/gear
->>>>>>> b084c69bd3c... Merge pull request #12086 from TheDavestDave/sword-3