[yast-commit] [yast/yast-packager] 3b9e12: removed merge conflicts