fix conflicts rebasing t-e-c on 0.84 version

Change-Id: I8edd8b26b86a4189add33deeadc5fc2f96bb34c0
Signed-off-by: Corentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>

diff --git a/bluetooth/bluetooth_instance_capi.cc b/bluetooth/bluetooth_instance_capi.cc
index 0ef439f..2e21fec 100644 (file)
--- a/bluetooth/bluetooth_instance_capi.cc
+++ b/bluetooth/bluetooth_instance_capi.cc
@@ -26,6 +26,7 @@ BluetoothInstance::~BluetoothInstance() {
   CAPI(bt_deinitialize());
 }
 
+void BluetoothInstance::Initialize() {
   CAPI(bt_initialize());
   InitializeAdapter();
 }