ovirt-engine master doesn't build anymore

[Alon Bar-Lev]

----- Original Message -----
> From: "Sandro Bonazzola" <sbonazzo at redhat.com>
> To: devel at ovirt.org
> Cc: "infra" <infra at ovirt.org>
> Sent: Wednesday, June 18, 2014 9:39:32 AM
> Subject: ovirt-engine master doesn't build anymore
> 
> See
> http://jenkins.ovirt.org/job/ovirt-engine_master_create-rpms-quick_gerrit/2664/label=fedora20/console
> Please fix ASAP, thanks.

Unresolved conflict[1]

[1] http://gerrit.ovirt.org/28875

> 
> --
> Sandro Bonazzola
> Better technology. Faster innovation. Powered by community collaboration.
> See how it works at redhat.com
> _______________________________________________
> Infra mailing list
> Infra at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/infra
>