Waldemar Brodkorb 2735fdf973 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
kernel 2735fdf973 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
sys-available 2735fdf973 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
Config.in 2735fdf973 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
Makefile 2735fdf973 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
target.mk 2735fdf973 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
uclibc.config 2735fdf973 resolve merge conflict %!s(int64=10) %!d(string=hai) anos