merge ok

app/nbproject/project.properties

@@ -31,11 +31,7 @@ endorsed.classpath=
 excludes=
 file.reference.bluecove-2.1.1-SNAPSHOT.jar=bluecove-2.1.1-SNAPSHOT.jar
 file.reference.javax.mail-api-1.4.7.jar=javax.mail-api-1.4.7.jar
-<<<<<<< HEAD
 file.reference.sqlite-jdbc-3.23.1.jar=C:\\Users\\puiss\\Downloads\\sqlite-jdbc-3.23.1.jar
-=======
-file.reference.javax.mail.jar-1=javax.mail.jar
->>>>>>> 84c06afd4e19e0ca4a71de80c0796fbf58b31b57
 includes=**
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
@@ -44,11 +40,7 @@ javac.classpath=\
     ${javafx.classpath.extension}:\
     ${file.reference.bluecove-2.1.1-SNAPSHOT.jar}:\
     ${file.reference.javax.mail-api-1.4.7.jar}:\
-<<<<<<< HEAD
     ${file.reference.sqlite-jdbc-3.23.1.jar}
-=======
-    ${file.reference.javax.mail.jar-1}
->>>>>>> 84c06afd4e19e0ca4a71de80c0796fbf58b31b57
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false