Build failed in Jenkins: FreeBSD_HEAD #2725

[Craig Rodrigues]

On Monday, May 4, 2015, Cy Schubert <Cy.Schubert at komquats.com
<javascript:_e(%7B%7D,'cvml','Cy.Schubert at komquats.com');>> wrote:
>
>
> I cannot see where the problem is. All local tests, including universe,
> have built cleanly.
>

 In this log: https://jenkins.freebsd.org/job/FreeBSD_HEAD/2725/console
search for:

error: version control conflict marker in file


--

Craig