test

fec22a6a · Louis Bahrman · 1f913a6c · fec22a6a
Commit fec22a6a authored Apr 21, 2020 by Louis Bahrman
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 15 deletions

private.properties nbproject/private/private.properties +15 -15

No files found.
--- a/nbproject/private/private.properties
+++ b/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=C:\\Users\\senda\\AppData\\Roaming\\NetBeans\\8.0.2\\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