security manager conflict commented

Dependencies:   microbit-dal2

Fork of microbit by Lancaster University

Revision:
2:de32a209b460
Parent:
0:0e2944a5dc65
Child:
3:26901b0a8080
diff -r af427e419320 -r de32a209b460 microbit-dal.lib
--- a/microbit-dal.lib	Thu Apr 07 01:30:13 2016 +0100
+++ b/microbit-dal.lib	Thu Apr 07 00:55:37 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/Lancaster-University/code/microbit-dal/#fb15f7887843
+https://developer.mbed.org/teams/Lancaster-University/code/microbit-dal/#557d9ac9e959