Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
patches 4dc2822fa7 resolve merge conflict %!s(int64=14) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos