Update cas.dm

2017-12-13 16:44:52 -05:00
parent 9f5cef7748
commit 81d30a08e6
1 changed files with 0 additions and 4 deletions
@@ -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)