Skip to content

Commit bdb7066

Browse files
committed
fix bad merge
1 parent 4deca98 commit bdb7066

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

  • ports/atmel-samd/boards/sparkfun_samd51_micromod

ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2021 Dan Halbert for Adafruit Industries
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal
@@ -24,12 +24,15 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
<< << << < HEAD: shared - module / keypad / __init__.h
28-
#ifndef SHARED_MODULE_KEYPAD_H
29-
#define SHARED_MODULE_KEYPAD_H
30-
== == == =
3127
#include "supervisor/board.h"
3228
#include "mpconfigboard.h"
33-
>> >> >> > adafruit / main: ports / atmel - samd / boards / sparkfun_samd51_micromod / board.c
3429

35-
#endif // SHARED_MODULE_KEYPAD_H
30+
void board_init(void) {
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
}

0 commit comments

Comments
 (0)