On Monday, May 4, 2015, Cy Schubert <cy.schub...@komquats.com <javascript:_e(%7B%7D,'cvml','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"
