From 450fb21130951bc2d10caa18c434732af9a4e192 Mon Sep 17 00:00:00 2001
From: Gergely Pilisi <gergely.pilisi@ericsson.com>
Date: Mon, 18 Apr 2016 10:00:52 +0200
Subject: [PATCH] Removed duplicated JDKDIR variable

Signed-off-by: Gergely Pilisi <gergely.pilisi@ericsson.com>
---
 Makefile.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile.cfg b/Makefile.cfg
index 3d864981c..c27c9f09a 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
->>>>>>> 318d000115c0c01e0d7077166c13a9ab3918e287
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default
-- 
GitLab