security manager conflict commented

Dependencies:   microbit-dal2

Fork of microbit by Lancaster University

Revision:
12:a62ca1ee7b52
Parent:
1:af427e419320
Child:
13:802a76669499
--- a/inc/MicroBit.h	Wed Jul 13 13:00:23 2016 +0100
+++ b/inc/MicroBit.h	Wed Jul 13 13:00:25 2016 +0100
@@ -185,7 +185,7 @@
       * Delay execution for the given amount of time.
       *
       * If the scheduler is running, this will deschedule the current fiber and perform
-      * a power efficent, concurrent sleep operation.
+      * a power efficient, concurrent sleep operation.
       *
       * If the scheduler is disabled or we're running in an interrupt context, this
       * will revert to a busy wait.
@@ -433,7 +433,7 @@
   * Delay execution for the given amount of time.
   *
   * If the scheduler is running, this will deschedule the current fiber and perform
-  * a power efficent, concurrent sleep operation.
+  * a power efficient, concurrent sleep operation.
   *
   * If the scheduler is disabled or we're running in an interrupt context, this
   * will revert to a busy wait.
@@ -655,4 +655,4 @@
 	microbit_panic(statusCode);
 }
 
-#endif
+#endif
\ No newline at end of file