ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge fail

pull/8738/head
paul-szczepanek-arm 2018-11-13 11:40:51 +00:00 committed by Vincent Coubard
parent bb8892a956
commit 4f769df976
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/ble/Gap.h
View File

@ -1153,8 +1153,6 @@ public:
* Definition of the general handler of Gap related events.
*/
struct EventHandler {
<<<<<<< HEAD
struct AdvertisingReportEvent {
AdvertisingReportEvent(
const AdvertisingEventType_t &type,