From c75225ef09f8433b0c920ce39cad019ff9a52c4d Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 27 May 2022 15:51:56 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../client/preference_setup/loadout/loadout_general_vr.dm    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm
index 4f241c4b6f..69515f5ad3 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm
@@ -94,10 +94,5 @@
 	
 /datum/gear/schnapsen
 	display_name = "schnapsen playing cards"
-<<<<<<< HEAD
-	description = "French-suit playing cards! Pre-picked for 2-player mode."
-	path = /obj/item/weapon/deck/schnapsen
-=======
 	description = "An ancient Austro-Hungarian suit of cards!"
 	path = /obj/item/weapon/deck/schnapsen
->>>>>>> ce50127b0a... Merge pull request #12997 from Runa-Dacino/schnapsen_fix