From c561ef53f9d7c9efe056eb5759576bac3cf27852 Mon Sep 17 00:00:00 2001
From: kristof <Kristof.Szabados@ericsson.com>
Date: Mon, 18 Apr 2016 13:20:30 +0200
Subject: [PATCH] commit correction

---
 Makefile.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile.cfg b/Makefile.cfg
index ea9473b02..f1f38d454 100644
--- 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 
->>>>>>> 4a0c4186d3c98f51d0735e21cca5918568a7082b
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default
-- 
GitLab