From 81d30a08e62049cfaf95a378776f0ad53a03c604 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 16:44:52 -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 62ac2fab1a..00e513dcbd 100644
--- a/code/modules/games/cas.dm
+++ b/code/modules/games/cas.dm
@@ -53,10 +53,6 @@
 		P.card_icon = "cas_white"
 		cards += P
 	shuffle_inplace(cards) // distribute blank cards throughout deck
-<<<<<<< HEAD
-	..()
-=======
->>>>>>> cfb0b8a... Merge pull request #33493 from vuonojenmustaturska/initializefixes
 
 /obj/item/toy/cards/deck/cas/attack_hand(mob/user)
 	if(user.lying)