On Fri, Mar 14, 2014 at 03:07:52AM +0000, Eitan Adler wrote: E> Author: eadler E> Date: Fri Mar 14 03:07:51 2014 E> New Revision: 263142 E> URL: http://svnweb.freebsd.org/changeset/base/263142 E> E> Log: E> multiple: Remove 3rd clause from BSD license where approved by the E> regents and renumber. E> E> This patch skips files in contrib/ and crypto/ E> E> Acked by: imp E> Discussed with: emaste E> E> Added: E> head/usr.sbin/IPXrouted/ E> - copied from r262539, head/usr.sbin/IPXrouted/
Seems like you blindly did "mine full", when subversion reported you a merge conflict. -- Totus tuus, Glebius. _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
