Waldemar Brodkorb
2735fdf973
resolve merge conflict
|
%!s(int64=11) %!d(string=hai) anos | |
|---|---|---|
| .. | ||
| lemote-yeelong | %!s(int64=11) %!d(string=hai) anos | |
| qemu-mips64 | %!s(int64=11) %!d(string=hai) anos | |
|
Waldemar Brodkorb
2735fdf973
resolve merge conflict
|
%!s(int64=11) %!d(string=hai) anos | |
|---|---|---|
| .. | ||
| lemote-yeelong | %!s(int64=11) %!d(string=hai) anos | |
| qemu-mips64 | %!s(int64=11) %!d(string=hai) anos | |