Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files c1e90da10c make xdm fly %!s(int64=12) %!d(string=hai) anos
patches 1b2cf1ddff forgot the patch %!s(int64=10) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos