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

Branch: refs/heads/review_160531_kexec_reboot Home: https://github.com/yast/yast-autoinstallation Commit: f2c7fdb88ef7f073fe489772aee1727ab631f431 https://github.com/yast/yast-autoinstallation/commit/f2c7fdb88ef7f073fe48977... Author: Stefan Schubert Date: 2016-07-07 (Thu, 07 Jul 2016) Changed paths: M package/autoyast2.changes Log Message: ----------- merge conflict