1 files changed, 1 insertions, 16 deletions

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 41e7d89..b9bfb7d 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -25,27 +25,16 @@ debug.test.classpath=\
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-<<<<<<< HEAD
-dist.jar=${dist.dir}/SimpleAPDU.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${libs.JCardSim2.2.classpath}
-=======
 dist.jar=${dist.dir}/ECTester.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
-#TODO remove SimpleAPDU when replaced with ECtester,java
+#TODO remove SimpleAPDU when replaced with ECtester.java
 excludes=**/SimpleAPDU.java
 includes=**
 jar.compress=false
 javac.classpath=\
     lib/jcardsim-2.2.2-all.jar:\
     lib/commons-cli-1.3.1.jar
->>>>>>> 14b5b42... major changes, ECTester rewrite, moved to valid package
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -69,11 +58,7 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
-<<<<<<< HEAD
-main.class=simpleapdu.SimpleAPDU
-=======
 main.class=cz.crcs.ectester.reader.ECTester
->>>>>>> 14b5b42... major changes, ECTester rewrite, moved to valid package
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false