From: Roland Häder <roland@mxchange.org>
Date: Wed, 17 May 2023 00:40:23 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cddf3a05b0e73a3e7a1ccc1c107b5a0049dd5e61;p=jfinancials-mailer-ejb.git

Continued:
- ops, I accidentally left this here
---

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 576db7c..d608eb3 100644
--- 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