diff --git a/BowlingKata/.classpath b/BowlingKata/.classpath new file mode 100644 index 0000000..1b83178 --- /dev/null +++ b/BowlingKata/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/BowlingKata/.gitignore b/BowlingKata/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/BowlingKata/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/BowlingKata/.project b/BowlingKata/.project new file mode 100644 index 0000000..9fccbe4 --- /dev/null +++ b/BowlingKata/.project @@ -0,0 +1,17 @@ + + + BowlingKata + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/BowlingKata/.settings/org.eclipse.jdt.core.prefs b/BowlingKata/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..3a21537 --- /dev/null +++ b/BowlingKata/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/PokerKata/.settings/org.eclipse.jdt.core.prefs b/PokerKata/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..3a21537 --- /dev/null +++ b/PokerKata/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/PokerKata/src/session3/PokerGame.java b/PokerKata/src/session3/PokerGame.java index 3950b7f..a36f2a5 100644 --- a/PokerKata/src/session3/PokerGame.java +++ b/PokerKata/src/session3/PokerGame.java @@ -3,8 +3,12 @@ package session3; import java.util.Arrays; /* SCORES +<<<<<<< HEAD * 2 Pair * 3 Three Of A Kind +======= + * 1 Pair ! +>>>>>>> origin/master * * S2K3R5H6S7 */