[yast-commit] [yast/yast-autoinstallation] ce9f38: merge conflict

Branch: refs/heads/review_160121_bug_962034_master Home: https://github.com/yast/yast-autoinstallation Commit: ce9f38b418b67bb686dce947f7309ea917630ffc https://github.com/yast/yast-autoinstallation/commit/ce9f38b418b67bb686dce94... Author: Stefan Schubert Date: 2016-01-21 (Thu, 21 Jan 2016) Changed paths: M package/autoyast2.spec Log Message: ----------- merge conflict