wbx 933e74c072 resolve merge conflict %!s(int64=14) %!d(string=hai) anos
..
2.6.36 46b2bb3001 Merge branch 'master' of git+ssh://openadk.org/git/openadk %!s(int64=14) %!d(string=hai) anos
2.6.37 933e74c072 resolve merge conflict %!s(int64=14) %!d(string=hai) anos