security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Committer:
Jonathan Austin
Date:
Thu Apr 07 01:33:22 2016 +0100
Revision:
1:8aa5cdb4ab67
Synchronized with git rev 55cb9199

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jonathan Austin 1:8aa5cdb4ab67 1 Joe Finney (@finneyj)
Jonathan Austin 1:8aa5cdb4ab67 2 James Devine (@jamesadevine)
Jonathan Austin 1:8aa5cdb4ab67 3 Martin Woolley (@bluetooth-mdw)
Jonathan Austin 1:8aa5cdb4ab67 4 Michał Moskal (@mmoskal)
Jonathan Austin 1:8aa5cdb4ab67 5 Robert May (@remay)
Jonathan Austin 1:8aa5cdb4ab67 6 Jonathan Protzenko (@msprotz)
Jonathan Austin 1:8aa5cdb4ab67 7 James Sheppard (@jamessheppard)
Jonathan Austin 1:8aa5cdb4ab67 8 Damien George (@dpgeorge)
Jonathan Austin 1:8aa5cdb4ab67 9 Mathew Else (@matthewelse)