Fixing merge mistake

Author: orrmany

libraries/Bluefruit52Lib/src/bluefruit.h

@@ -172,7 +172,6 @@ class AdafruitBluefruit
 
     BLEConnection* Connection(uint16_t conn_hdl);
 
-<<<<<<< HEAD
 #ifdef ANT_LICENSE_KEY
     /*------------------------------------------------------------------*
      * Optional semaphore for additional event handlers for SD event.
@@ -184,17 +183,6 @@ class AdafruitBluefruit
     } 
 #endif
 
-=======
->>>>>>> origin/develop-ant-plus-ble
-    /*------------------------------------------------------------------*
-     * Optional semaphore for additional event handlers for SD event.
-     * It can be used for handling non-BLE  SD events 
-     *------------------------------------------------------------------*/
-    void setMultiprotocolSemaphore(SemaphoreHandle_t* p_mprot_event_semaphore) 
-    { 
-        _mprot_event_sem= p_mprot_event_semaphore;
-    } 
-
     /*------------------------------------------------------------------*/
     /* Callbacks
      *------------------------------------------------------------------*/
@@ -237,17 +225,13 @@ class AdafruitBluefruit
 
     SemaphoreHandle_t _ble_event_sem;
     SemaphoreHandle_t _soc_event_sem;
-<<<<<<< HEAD
+
 #ifdef ANT_LICENSE_KEY
     /* Optional semaphore for additional event handlers for SD event.
      * It can be used for handling non-BLE  SD events 
      */
     SemaphoreHandle_t* _mprot_event_sem;
 #endif
-=======
-    SemaphoreHandle_t* _mprot_event_sem;
-
->>>>>>> origin/develop-ant-plus-ble
 
     // Auto LED Blinky
     TimerHandle_t _led_blink_th;