[yast-commit] [yast/yast-yast2] c53a8f: refactoring - move the file conflict callbacks