security manager conflict commented

Dependencies:   microbit-dal2

Fork of microbit by Lancaster University

Revision:
14:4b89e7e3494f
Parent:
4:98baeb3ec6e4
Child:
15:3f2b163f5fe0
--- a/microbit-dal.lib	Wed Jul 13 13:00:26 2016 +0100
+++ b/microbit-dal.lib	Wed Jul 13 14:33:05 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/Lancaster-University/code/microbit-dal/#d7a25f36907e
+https://developer.mbed.org/teams/Lancaster-University/code/microbit-dal/#eb91bba49623