Resolved merge conflicts
authormartyy <triska@unipi.technology>
Sun, 1 Mar 2020 18:10:27 +0000 (19:10 +0100)
committermartyy <triska@unipi.technology>
Sun, 1 Mar 2020 18:10:27 +0000 (19:10 +0100)
commit7c97fdd9883f453a9db6963c22b755f592d779b4
tree77ffb2e24cc171e40377d2b2a209b40c23f7a43e
parentdfe44fcbcdd876185591e78c68d60aed7e00a509
parent4c80852d97d12b66c1ab24704ae83d5408898ad3
Resolved merge conflicts
Makefile
modules/unipi/src/unipi_uart.c