X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.cfg;fp=Makefile.cfg;h=3d864981c084290401b957a8caa509436c834bca;hb=9e07d6a95a72ac44f372dc080fd607d9e0a751a1;hp=c27c9f09aef30330e872698b9edab9714af9ee00;hpb=26d873cb039253adb7987fe00bdd8b1a536d4c7f;p=deliverable%2Ftitan.core.git

diff --git a/Makefile.cfg b/Makefile.cfg
index c27c9f0..3d86498 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -88,7 +88,11 @@ 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