Oved Ourfali has submitted this change and it was merged. Change subject: core: removed non-used LdapVendorEnum ...................................................................... core: removed non-used LdapVendorEnum fixes a weired merge issue with http://gerrit.ovirt.org/#/c/4633 Change-Id: I3a7aabc161e8be0fa5ab436108e9b0bb8028a11b Signed-off-by: Roy Golan <rgolan@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapVendorNameEnum.java D backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/ldap/LdapVendorNameEnum.java 3 files changed, 1 insertion(+), 36 deletions(-) Approvals: Oved Ourfali: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5120 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a7aabc161e8be0fa5ab436108e9b0bb8028a11b Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Sharad Mishra <snmishra@linux.vnet.ibm.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs@redhat.com>