[yast-commit] [yast/yast-ldap] 958536: Add missed conflict