Skip to content

G
Groupe3-TicTacToe
Commit fec22a6a authored by Louis Bahrman's avatar Louis Bahrman
Browse files
Options

test

parent 1f913a6c
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
nbproject/private/private.properties
View file @ fec22a6a
<<<<<<< HEAD <<<<<<< HEAD
compile.on.save=true compile.on.save=true
do.depend=false do.depend=false
do.jar=true do.jar=true
javac.debug=true javac.debug=true
javadoc.preview=true javadoc.preview=true
user.properties.file=C:\\Users\\timot\\AppData\\Roaming\\NetBeans\\11.2\\build.properties user.properties.file=C:\\Users\\timot\\AppData\\Roaming\\NetBeans\\11.2\\build.properties
======= =======
compile.on.save=true compile.on.save=true
do.depend=false do.depend=false
do.jar=true do.jar=true
javac.debug=true javac.debug=true
javadoc.preview=true javadoc.preview=true
user.properties.file=C:\\Users\\senda\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties user.properties.file=/home/louis/.netbeans/11.3/build.properties
>>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04 >>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment