From 4f769df9760b2586361d934917d074864be5afc7 Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Tue, 13 Nov 2018 11:40:51 +0000
Subject: [PATCH] merge fail

---
 features/FEATURE_BLE/ble/Gap.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/features/FEATURE_BLE/ble/Gap.h b/features/FEATURE_BLE/ble/Gap.h
index 48d045a547..bed9ce5d3c 100644
--- a/features/FEATURE_BLE/ble/Gap.h
+++ b/features/FEATURE_BLE/ble/Gap.h
@@ -1153,8 +1153,6 @@ public:
      * Definition of the general handler of Gap related events.
      */
     struct EventHandler {
-<<<<<<< HEAD
-
         struct AdvertisingReportEvent {
             AdvertisingReportEvent(
                 const AdvertisingEventType_t &type,