Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
src f2ca4c1e61 add bluetooth firmware %!s(int64=10) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos