Merge remote-tracking branch 'origin/master'

Conflicts:
	PokerKata/src/session3/PokerGame.java
This commit is contained in:
crille committed 2015-04-27 13:53:18 +02:00
commit d0bdcbf911
6 files changed
+52

No files matched your search

+4
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
*/