I think jenkins copy of head still contains ntp_parser.y. I see no issue here.
Cy Schubert <cy.schub...@cschubert.com> 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.schub...@komquats.com> wrote: > That file was deleted long ago. > > Cy Schubert > <cy.schub...@cschubert.com> > On May 4, 2015 7:49 AM, "Craig Rodrigues" <rodr...@freebsd.org> wrote: > >> >> >> On Monday, May 4, 2015, Cy Schubert <cy.schub...@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 >> >> >> >> _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
