security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
13:8d33728584d9
Parent:
9:960ce8922159
Child:
15:65509c60005c
--- a/module.json	Fri Apr 08 15:17:22 2016 +0100
+++ b/module.json	Fri Apr 08 15:18:42 2016 +0100
@@ -16,7 +16,7 @@
   "dependencies": {
     "mbed-classic": "lancaster-university/mbed-classic#microbit_hfclk+mb3",
     "ble": "lancaster-university/BLE_API#v2.5.0+mb3",
-    "ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb5",
+    "ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb6",
     "nrf51-sdk": "lancaster-university/nrf51-sdk#v2.2.0+mb3"
   },
   "extraIncludes": [