Refresh

db4aeede · LAIRD Timothy · 46b31b63 · db4aeede · db4aeede
Commit db4aeede authored Mar 31, 2020 by LAIRD Timothy
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Player.class build/classes/tictactoecodingame/Player.class +0 -0

Player.java src/tictactoecodingame/Player.java +1 -5

No files found.
--- a/build/classes/tictactoecodingame/Player.class
+++ b/build/classes/tictactoecodingame/Player.class
--- a/src/tictactoecodingame/Player.java
+++ b/src/tictactoecodingame/Player.java
@@ -23,11 +23,7 @@ public class Player {
             
        GrilleTicTacToe3x3 grille = new GrilleTicTacToe3x3();
         
-<<<<<<< HEAD
-        Arbitre a = new Arbitre(grille, joueurOrdi , joueurOrdi );
-=======
-        Arbitre a = new Arbitre(grille, joueurOrdi , humain );
->>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04
+        Arbitre a = new Arbitre(grille,joueurOrdi, humain );
       
        a.startNewGame(true);    // Demarre une partie en affichant la grille du jeu