Skip to content
Snippets Groups Projects
Commit c561ef53 authored by Kristof Szabados's avatar Kristof Szabados
Browse files

commit correction

parent dcbabe5e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
Makefile.cfg
+ 0
− 4
View file @ c561ef53
...@@ -88,11 +88,7 @@ JNI := yes ...@@ -88,11 +88,7 @@ JNI := yes
# Path of the Java Developement Kit installation # Path of the Java Developement Kit installation
# (must be at least version 1.5.0_10) # (must be at least version 1.5.0_10)
<<<<<<< HEAD
JDKDIR := /usr/lib/jvm/default-java JDKDIR := /usr/lib/jvm/default-java
=======
JDKDIR := /usr/lib/jvm/default-java
>>>>>>> 4a0c4186d3c98f51d0735e21cca5918568a7082b
# Path of OpenSSL installation: (always required) # Path of OpenSSL installation: (always required)
OPENSSL_DIR := default OPENSSL_DIR := default
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent