fix bad merge

This commit is contained in:
Dan Halbert 2021-06-09 23:47:49 -04:00
parent 4deca98f59
commit bdb70669a1
1 changed files with 10 additions and 7 deletions

View File

@ -3,7 +3,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2021 Dan Halbert for Adafruit Industries
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -24,12 +24,15 @@
* THE SOFTWARE.
*/
<< << << < HEAD: shared - module / keypad / __init__.h
#ifndef SHARED_MODULE_KEYPAD_H
#define SHARED_MODULE_KEYPAD_H
== == == =
#include "supervisor/board.h"
#include "mpconfigboard.h"
>> >> >> > adafruit / main: ports / atmel - samd / boards / sparkfun_samd51_micromod / board.c
#endif // SHARED_MODULE_KEYPAD_H
void board_init(void) {
}
bool board_requests_safe_mode(void) {
return false;
}
void reset_board(void) {
}