security manager conflict commented

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Committer:
cristianobarbosa
Date:
Fri Jan 26 14:13:26 2018 +0000
Revision:
74:d5267e1fd5f9
Parent:
73:eb91bba49623
receiver bib

Who changed what in which revision?

UserRevisionLine numberNew contents of line
JonnyA 73:eb91bba49623 1 https://developer.mbed.org/teams/Lancaster-University/code/mbed-dev-bin/#768173a57492