Add missed conflict
Add missed conflict
Adapt yast2-ldap-client version
Merge pull request #6 from varkoly/master

add missed conflict