Branch: refs/heads/master Home: https://github.com/yast/yast-ldap Commit: 9585365dc7b6c2703db6576ec5b4e5d914a44b28 https://github.com/yast/yast-ldap/commit/9585365dc7b6c2703db6576ec5b4e5d914a... Author: Peter Varkoly <varkoly@suse.de> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M package/yast2-ldap.spec Log Message: ----------- Add missed conflict Commit: 0ae0ef2ad9749c049ffe1c09404fdfb3bed440a4 https://github.com/yast/yast-ldap/commit/0ae0ef2ad9749c049ffe1c09404fdfb3bed... Author: Peter Varkoly <varkoly@suse.de> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M package/yast2-ldap.spec Log Message: ----------- Add missed conflict Commit: 298336762f3d021cc89e7ebfd59055434261f51a https://github.com/yast/yast-ldap/commit/298336762f3d021cc89e7ebfd5905543426... Author: Peter Varkoly <varkoly@suse.de> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M package/yast2-ldap.spec Log Message: ----------- Adapt yast2-ldap-client version Commit: 107f72812623feb29b085a67e779d1ce642ce1d4 https://github.com/yast/yast-ldap/commit/107f72812623feb29b085a67e779d1ce642... Author: Peter Varkoly <varkoly@suse.de> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M package/yast2-ldap.spec Log Message: ----------- Merge pull request #6 from varkoly/master add missed conflict Compare: https://github.com/yast/yast-ldap/compare/889f4c4f8fad...107f72812623