security manager conflict commented

Dependencies:   microbit2

Revision:
1:ccc3886c1350
Parent:
0:6ec669ffadd7
--- a/microbit.lib	Fri Jan 26 14:14:18 2018 +0000
+++ b/microbit.lib	Fri Jan 26 14:22:44 2018 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/teams/Lancaster-University/code/microbit/#3f2b163f5fe0
+https://os.mbed.com/users/cristianobarbosa/code/microbit2/#f21293a4597e