Itamar Heim has submitted this change and it was merged. Change subject: engine: Conflict issue fix ...................................................................... engine: Conflict issue fix Issue in patchset: http://gerrit.ovirt.org/#change,4302 Change-Id: Ic4f981bbc0e5cf37a8af9a0f17c97df64204c482 Signed-off-by: Dhandapani <dgopal(a)redhat.com&gt; --- M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Itamar Heim: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/4477 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4f981bbc0e5cf37a8af9a0f17c97df64204c482 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Dhandapani Gopal <dgopal(a)redhat.com&gt; Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt;