Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos
..
files 2d7666cde2 simplify add_rcconf %!s(int64=11) %!d(string=hai) anos
src 7330eb4540 fix daemon mode %!s(int64=15) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos