security manager conflict commented

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
69:b62f231e51ce
Parent:
1:8aa5cdb4ab67
--- a/inc/types/MicroBitImage.h	Wed Jul 13 12:18:48 2016 +0100
+++ b/inc/types/MicroBitImage.h	Wed Jul 13 12:18:49 2016 +0100
@@ -247,7 +247,7 @@
     int setPixelValue(int16_t x , int16_t y, uint8_t value);
 
     /**
-      * Retreives the value of a given pixel.
+      * Retrieves the value of a given pixel.
       *
       * @param x The x co-ordinate of the pixel to read. Must be within the dimensions of the image.
       *
@@ -287,7 +287,7 @@
     /**
       * Pastes a given bitmap at the given co-ordinates.
       *
-      * Any pixels in the relvant area of this image are replaced.
+      * Any pixels in the relevant area of this image are replaced.
       *
       * @param image The MicroBitImage to paste.
       *
@@ -477,4 +477,4 @@
     MicroBitImage clone();
 };
 
-#endif
+#endif
\ No newline at end of file