From ad5441a1440d5b73892d31a22e1a1c7133a591a2 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 25 Aug 2021 21:25:20 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../structures/crates_lockers/closets/secure/security.dm     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 2d11c49aa6..8dbb42c80d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -238,14 +238,9 @@
 
 	starts_with = list(
 		/obj/item/clothing/accessory/badge/holo/detective,
-<<<<<<< HEAD
 		/obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves
 		/obj/item/gunbox, //CHOMP Edit undoes vorestation removal and adds back gunbox
-=======
-		/obj/item/clothing/gloves/black,
-		///obj/item/gunbox, // VOREStation Removal
 		///obj/item/weapon/gun/energy/stunrevolver/vintage, // VOREStation Removal
->>>>>>> fd8da95ec7 (Merge pull request #11408 from VOREStation/upstream-merge-8178)
 		/obj/item/weapon/storage/belt/detective,
 		/obj/item/weapon/storage/box/evidence,
 		/obj/item/device/radio/headset/headset_sec,