Fix issues caused by auto merge
@@ -170,16 +170,6 @@ SUPPORTED_CONFIGURATIONS = [
( 0x7402, 'lpc11u35_6lowpan_borderrouterhat_if', None, 'mbed-6LoWPAN-Border-Router-HAT' ),
( 0x7403, 'lpc11u35_6lowpan_borderrouterusb_if', None, 'mbed-6LoWPAN-Border-Router-USB' ),
( 0x7404, 'lpc11u35_6lowpan_borderrouterethernet_if', None, 'mbed-6LoWPAN-Border-Router-ETHERNET' ),
-<<<<<<< HEAD
- ( 0xC000, 'lpc11u35_cocorico_if', None, None ), # TODO - set target to 'CoCo-ri-Co' when mbed-os supports this
- ( 0x5500, 'lpc11u35_gr_peach_if', None, 'Renesas-GR-PEACH' ),
- ( 0x6660, 'lpc11u35_nz32_sc151_if', None, 'NZ32-SC151' ),
- ( 0x2201, 'lpc11u35_wizwiki_w7500_if', None, 'WIZWIKI_W7500' ),
- ( 0x2202, 'lpc11u35_wizwiki_w7500_eco_if', None, 'WIZWIKI_W7500ECO' ),
- ( 0x2203, 'lpc11u35_wizwiki_w7500p_if', None, 'WIZWIKI_W7500P' ),
- ( 0x1237, 'sam3u2c_ublox_evk_nina_b1_if', 'sam3u2c_bl', 'UBLOX-EVK-NINA-B1' ),
- ( 0xC006, 'lpc11u35_vbluno51_if', None, 'VNG-VBLUno51' ),
-=======
( 0xC000, 'lpc11u35_cocorico_if', None, 'CoCo-ri-Co' ),
( 0x5500, 'lpc11u35_gr_peach_if', None, None ), # TODO - Set to 'Renesas-GR-PEACH' once this target builds
( 0x6660, 'lpc11u35_nz32_sc151_if', None, None ), # TODO - set target to 'NZ32-SC151' when mbed-os supports this
@@ -188,7 +178,6 @@ SUPPORTED_CONFIGURATIONS = [
( 0x2203, 'lpc11u35_wizwiki_w7500p_if', None, 'WIZwiki-W7500P' ),
( 0x1237, 'sam3u2c_ublox_evk_nina_b1_if', 'sam3u2c_bl', 'U-BLOX-EVK-NINA-B1' ),
( 0xC006, 'lpc11u35_vbluno51_if', None, 'VBLUNO51' ),
->>>>>>> upstream/master
( 0xC005, 'lpc11u35_mtconnect04s_if', None, 'MtConnect04S' ),
]
