[yast-commit] [libyui/libyui-qt-pkg] 5ba68c: fix kept merge marker

Branch: refs/heads/graphical_cc Home: https://github.com/libyui/libyui-qt-pkg Commit: 5ba68c76642c0ca7745371287973d3a170ef78d1 https://github.com/libyui/libyui-qt-pkg/commit/5ba68c76642c0ca7745371287973d... Author: Josef Reidinger Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M package/libyui-qt-pkg.changes Log Message: ----------- fix kept merge marker