On Monday, May 4, 2015, Cy Schubert <[email protected] <javascript:_e(%7B%7D,'cvml','[email protected]');>> 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 _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "[email protected]"
