[yast-commit] [yast/yast-packager] af1511: remove merge conflict relict

Branch: refs/heads/rubygem_fix Home: https://github.com/yast/yast-packager Commit: af1511c05a05ca440f3ab6c7102648a61fd1bd73 https://github.com/yast/yast-packager/commit/af1511c05a05ca440f3ab6c7102648a... Author: Josef Reidinger Date: 2014-09-04 (Thu, 04 Sep 2014) Changed paths: M package/yast2-packager.changes Log Message: ----------- remove merge conflict relict