security manager conflict commented

Dependencies:   microbit-dal2

Fork of microbit by Lancaster University

Revision:
4:98baeb3ec6e4
Parent:
3:26901b0a8080
Child:
14:4b89e7e3494f
diff -r 26901b0a8080 -r 98baeb3ec6e4 microbit-dal.lib
--- a/microbit-dal.lib	Fri Apr 08 00:19:21 2016 +0000
+++ b/microbit-dal.lib	Fri Apr 08 16:46:20 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/Lancaster-University/code/microbit-dal/#d33e0942b66e
+https://developer.mbed.org/teams/Lancaster-University/code/microbit-dal/#d7a25f36907e