From 72e65bebe12bb81a8011bf27684793f4f9e71426 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Wed, 24 Feb 2021 20:28:32 +0100
Subject: [PATCH] fix merge conflicts

---
 src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc b/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
index e1c8a03..81f7d6e 100644
--- a/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
+++ b/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
@@ -274,7 +274,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_release(JNI
     Adapter::session(pEp::Adapter::release);
 }
 
-JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_setDebugLogEnabled(
+JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1setDebugLogEnabled(
         JNIEnv *env,
         jclass clazz,
         jboolean enabled)
@@ -282,7 +282,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_setDebugLog
     Adapter::pEpLog::set_enabled(static_cast<bool>(enabled));
 }
 
-JNIEXPORT jboolean JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_getDebugLogEnabled(
+JNIEXPORT jboolean JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1getDebugLogEnabled(
         JNIEnv *env,
         jclass clazz
     )