Merge branch 'main' of https://github.com/Edrig/circuitpython into main

modifié : boards/holyiot_nrf52840/pins.c
2020-10-28 00:40:46 +01:00 · 2020-10-28 00:40:46 +01:00 · b5c95e3b1a
parent 9b911b2211 d0426b3438
commit b5c95e3b1a
1 changed files with 0 additions and 4 deletions
--- a/ports/nrf/boards/holyiot_nrf52840/pins.c
+++ b/ports/nrf/boards/holyiot_nrf52840/pins.c
@ -54,8 +54,4 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {

 };

-<<<<<<< HEAD
-=======
-
->>>>>>> d0426b3438a934257c5351f7eb2d9cdd79881c03
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);