crille/SoftwareCraftmanship
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	PokerKata/src/session3/PokerGame.java
This commit is contained in:
Christian Ohlsson
2015-04-27 13:53:18 +02:00
parent 8a41e1d1f4 18cf0d4314
commit d0bdcbf911
6 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PokerKata/src/session3/PokerGame.java
View File

@@ -3,8 +3,12 @@ package session3;
import java.util.Arrays;
/* SCORES
<<<<<<< HEAD
* 2 Pair
* 3 Three Of A Kind
=======
* 1 Pair !
>>>>>>> origin/master
*
* S2K3R5H6S7
*/