Juan Hernandez has submitted this change and it was merged. Change subject: packaging: fix file conflict when upgrading setup due to versionlock ...................................................................... packaging: fix file conflict when upgrading setup due to versionlock Change-Id: I2f69ac24b375ecbc0abecec4f617cfb97309e390 Signed-off-by: Alon Bar-Lev <alonbl@redhat.com> --- M ovirt-engine.spec.in 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15284 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f69ac24b375ecbc0abecec4f617cfb97309e390 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl@redhat.com> Gerrit-Reviewer: Alex Lourie <alourie@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Ofer Schreiber <oschreib@redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo@redhat.com>