[yast-commit] [yast/yast-yast2] cde904: initial file conflicts support