diff options
Diffstat (limited to 'tmk_core/common/arm_atsam')
| -rw-r--r-- | tmk_core/common/arm_atsam/printf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tmk_core/common/arm_atsam/printf.c b/tmk_core/common/arm_atsam/printf.c index 2cb59706a8..6f7e8d343f 100644 --- a/tmk_core/common/arm_atsam/printf.c +++ b/tmk_core/common/arm_atsam/printf.c @@ -68,5 +68,8 @@ void console_printf(char *fmt, ...) { } #endif // CONSOLE_ENABLE +<<<<<<< HEAD +======= -void print_set_sendchar(sendchar_func_t send) {}
\ No newline at end of file +void print_set_sendchar(sendchar_func_t send) {} +>>>>>>> 0.12.52~1 |