test push

nbproject/genfiles.properties

+<<<<<<< HEAD
 build.xml.data.CRC32=662cc432
 build.xml.script.CRC32=54ced37f
 build.xml.stylesheet.CRC32=f85dc8f2@1.93.0.48
@@ -6,3 +7,13 @@ build.xml.stylesheet.CRC32=f85dc8f2@1.93.0.48
 nbproject/build-impl.xml.data.CRC32=662cc432
 nbproject/build-impl.xml.script.CRC32=fe7dced2
 nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.93.0.48
+=======
+build.xml.data.CRC32=662cc432
+build.xml.script.CRC32=54ced37f
+build.xml.stylesheet.CRC32=f85dc8f2@1.94.0.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=662cc432
+nbproject/build-impl.xml.script.CRC32=fe7dced2
+nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.94.0.48
+>>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04

nbproject/private/private.properties

+<<<<<<< HEAD
 compile.on.save=true
 do.depend=false
 do.jar=true
 javac.debug=true
 javadoc.preview=true
 user.properties.file=C:\\Users\\timot\\AppData\\Roaming\\NetBeans\\11.2\\build.properties
+=======
+compile.on.save=true
+do.depend=false
+do.jar=true
+javac.debug=true
+javadoc.preview=true
+user.properties.file=/home/louis/.netbeans/11.3/build.properties
+>>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04

nbproject/project.properties

+<<<<<<< HEAD
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
@@ -86,3 +87,93 @@ run.test.modulepath=\
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test
+=======
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=TicTacToeCodingame
+application.vendor=franck.tempet
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/TicTacToeCodingame.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=tictactoecodingame.Player
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
+>>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04

src/tictactoecodingame/Player.java

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