Revert "Delete private.properties"

This reverts commit d234958a

Revert "Delete private.properties"
This reverts commit d234958a
61450a23 · DELBECQ Théo · 5f3c6c8a · 61450a23
Commit 61450a23 authored Apr 28, 2020 by DELBECQ Théo
Hide whitespace changes
Inline Side-by-side

Showing with 51 additions and 0 deletions

private.properties nbproject/private/private.properties +51 -0

No files found.
--- a/nbproject/private/private.properties
+++ b/nbproject/private/private.properties
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< 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
+=======
+<<<<<<< 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
+>>>>>>> 4f5ab9d710d3dfdc1fe71236031395a85db95bec
+=======
+<<<<<<< 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=C:\\Users\\theo\\AppData\\Roaming\\NetBeans\\11.3\\build.properties
+>>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04
+>>>>>>> 94177790fa8a419aa9237d306f5420565be1ebd3