security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
63:b4372a29994f
Parent:
27:2f494ead23de
Child:
65:f7ebabf23e15
--- a/inc/platform/yotta_cfg_mappings.h	Wed Jul 13 12:18:41 2016 +0100
+++ b/inc/platform/yotta_cfg_mappings.h	Wed Jul 13 12:18:42 2016 +0100
@@ -63,6 +63,10 @@
     #define MICROBIT_DEFAULT_PRINT_SPEED YOTTA_CFG_MICROBIT_DAL_DISPLAY_PRINT_SPEED
 #endif
 
+#ifdef YOTTA_CFG_MICROBIT_DAL_DEFAULT_PULLMODE
+    #define MICROBIT_DEFAULT_PULLMODE YOTTA_CFG_MICROBIT_DAL_DEFAULT_PULLMODE
+#endif
+
 #ifdef YOTTA_CFG_MICROBIT_DAL_PANIC_ON_HEAP_FULL
     #define MICROBIT_PANIC_HEAP_FULL YOTTA_CFG_MICROBIT_DAL_PANIC_ON_HEAP_FULL
 #endif