From 4dded2ec62afa51a9d160f792d41354e4500c739 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 6 Feb 2022 21:43:02 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/game/machinery/suit_storage_unit_vr.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm
index 25cfd1121c..8eab955554 100644
--- a/code/game/machinery/suit_storage_unit_vr.dm
+++ b/code/game/machinery/suit_storage_unit_vr.dm
@@ -53,12 +53,9 @@
 	model_text = "Talon captain"
 	req_access = list(access_talon)
 	departments = list(/datum/suit_cycler_choice/department/talon/officer)
-<<<<<<< HEAD
-=======
 
 /obj/machinery/suit_cycler/vintage/tminer
 	name = "Talon miner suit cycler"
 	model_text = "Talon miner"
 	req_access = list(access_talon)
 	departments = list(/datum/suit_cycler_choice/department/talon/miner)
->>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining