diff options
| author | Gaetan <gaetan.noel@viacesi.fr> | 2020-10-28 00:40:46 +0100 |
|---|---|---|
| committer | Gaetan <gaetan.noel@viacesi.fr> | 2020-10-28 00:40:46 +0100 |
| commit | b5c95e3b1a97fb8c2b370d665791a89b85ead50a (patch) | |
| tree | c17a32b7e5ab688ab5fd0f21c565a8236b73f6fe | |
| parent | 9b911b2211715e9da7ae55b691f54fe2f33a4486 (diff) | |
| parent | d0426b3438a934257c5351f7eb2d9cdd79881c03 (diff) | |
Merge branch 'main' of https://github.com/Edrig/circuitpython into main
modifié : boards/holyiot_nrf52840/pins.c
| -rw-r--r-- | ports/nrf/boards/holyiot_nrf52840/pins.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ports/nrf/boards/holyiot_nrf52840/pins.c b/ports/nrf/boards/holyiot_nrf52840/pins.c index 8e0667591..c9e222b67 100644 --- 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); |