security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
53:ee44932401cb
Parent:
49:88f03f3feff1
Child:
63:b4372a29994f
--- a/inc/drivers/MicroBitPin.h	Wed Jul 13 12:18:31 2016 +0100
+++ b/inc/drivers/MicroBitPin.h	Wed Jul 13 12:18:32 2016 +0100
@@ -342,7 +342,7 @@
     /**
       * Configures the pull of this pin.
       *
-      * @param pull one of the mbed pull configurations: PullUp, PullDown, PullNone, OpenDrain
+      * @param pull one of the mbed pull configurations: PullUp, PullDown, PullNone
       *
       * @return MICROBIT_NOT_SUPPORTED if the current pin configuration is anything other
       *         than a digital input, otherwise MICROBIT_OK.