From 9f5cef7748ea322d38bcba2a28c6ab3f3dcb36b1 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 16:44:34 -0500
Subject: [PATCH] Update cas.dm

---
 code/modules/games/cas.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm
index 7c32e3235a..62ac2fab1a 100644
--- a/code/modules/games/cas.dm
+++ b/code/modules/games/cas.dm
@@ -27,12 +27,8 @@
 	decksize = 50
 	card_text_file = "strings/cas_black.txt"
 
-<<<<<<< HEAD
-/obj/item/toy/cards/deck/cas/New()
-=======
 /obj/item/toy/cards/deck/cas/Initialize()
 	. = ..()
->>>>>>> cfb0b8a... Merge pull request #33493 from vuonojenmustaturska/initializefixes
 	var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt"))
 	allcards = cards_against_space[card_face]
 	var/list/possiblecards = allcards.Copy()