security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
69:b62f231e51ce
Parent:
1:8aa5cdb4ab67
--- a/inc/drivers/MicroBitMultiButton.h	Wed Jul 13 12:18:48 2016 +0100
+++ b/inc/drivers/MicroBitMultiButton.h	Wed Jul 13 12:18:49 2016 +0100
@@ -148,7 +148,7 @@
 
     /**
       * Changes the event configuration of this button to the given MicroBitButtonEventConfiguration.
-      * All subsequent events generated by this button will then be informed by this configuraiton.
+      * All subsequent events generated by this button will then be informed by this configuration.
       *
       * @param config The new configuration for this button. Legal values are MICROBIT_BUTTON_ALL_EVENTS or MICROBIT_BUTTON_SIMPLE_EVENTS.
       *
@@ -173,4 +173,4 @@
     void onButtonEvent(MicroBitEvent evt);
 };
 
-#endif
+#endif
\ No newline at end of file