clang specific define in Runtime.cc

[deliverable/titan.core.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 3d864981c084290401b957a8caa509436c834bca..f1f38d454ed55588d0771df9897c0d2a8e01cad1 100644 (file)
--- a/Makefile.cfg
+++ b/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