security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
65:f7ebabf23e15
Parent:
63:b4372a29994f
Child:
66:2fc7d7c2fffc
--- a/inc/platform/yotta_cfg_mappings.h	Wed Jul 13 12:18:43 2016 +0100
+++ b/inc/platform/yotta_cfg_mappings.h	Wed Jul 13 12:18:45 2016 +0100
@@ -63,10 +63,6 @@
     #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