Merge pull request #39 from gpilisi/master

Removed duplicated JDKDIR variable

Makefile.cfg

@@ -88,11 +88,7 @@ JNI := yes
 
 # Path of the Java Developement Kit installation
 # (must be at least version  1.5.0_10)
-<<<<<<< HEAD
 JDKDIR := /usr/lib/jvm/default-java 
-=======
-JDKDIR := /usr/lib/jvm/default-java
->>>>>>> 318d000115c0c01e0d7077166c13a9ab3918e287
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default