Build failed in Jenkins: FreeBSD_HEAD #2725

From: Craig Rodrigues <rodrigc_at_FreeBSD.org>
Date: Mon, 4 May 2015 10:49:45 -0400
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
Received on Mon May 04 2015 - 12:49:48 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:57 UTC