Continued:

- ops, I accidentally left this here

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 576db7c622365a0d2c027cfd739df65ba59fe6db..d608eb32ccd62f7efb57f7f5e9a4e2363087f8a1 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -48,7 +48,6 @@ javac.classpath=\
     ${reference.jfinancials-mailer-lib.jar}:\
     ${libs.velocity.classpath}:\
     ${libs.javaee-api-7.0.classpath}
->>>>>>> e4cc82df... Don't cherry-pick:
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.debug=true
 javac.deprecation=true