Ofer Schreiber has submitted this change and it was merged. Change subject: packaging: fix issue with conflict of latest two independent merges ...................................................................... packaging: fix issue with conflict of latest two independent merges Change-Id: I1e297aaba1847b5623461486255295ae334f53ff Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com&gt; --- M packaging/services/ovirt-engine.xml.in 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alon Bar-Lev: Verified Ofer Schreiber: Looks good to me, approved Ohad Basan: Verified; Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/15268 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e297aaba1847b5623461486255295ae334f53ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com&gt; Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com&gt; Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com&gt; Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com&gt; Gerrit-Reviewer: Ohad Basan <obasan(a)redhat.com&gt;