From d8b6de1db0239cc96d392dbb2d1ad850a8de1dfc Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 28 Aug 2022 18:33:36 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/client/stored_item.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm
index bff1ec3953..88dbbe2ee8 100644
--- a/code/modules/client/stored_item.dm
+++ b/code/modules/client/stored_item.dm
@@ -250,10 +250,7 @@
 	persist_storable = FALSE
 /obj/item/weapon/rcd
 	persist_storable = FALSE
-<<<<<<< HEAD
-=======
 /obj/item/weapon/spacecash
 	persist_storable = FALSE
 /obj/item/weapon/spacecasinocash
 	persist_storable = FALSE
->>>>>>> e5ae85f667... Merge pull request #13536 from Heroman3003/casino-changes