Build failed in Jenkins: FreeBSD_HEAD #2725

[Craig Rodrigues]

You need to do a better job at figuring out why you broke things.
This is not the first time you've broken things with an ntp import.

--
Craig
 On May 4, 2015 8:45 AM, "Cy Schubert" <Cy.Schubert at komquats.com> wrote:

> That file was deleted long ago.
>
> Cy Schubert
> <Cy.Schubert at cschubert.com>
> On May 4, 2015 7:49 AM, "Craig Rodrigues" <rodrigc at freebsd.org> wrote:
>
>>
>>
>> On Monday, May 4, 2015, Cy Schubert <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
>>
>>
>>
>>