[EMAIL PROTECTED] wrote: > Author: bdubbs > Date: 2005-07-29 15:24:30 -0600 (Fri, 29 Jul 2005) > New Revision: 4834 <snip> > Modified: trunk/BOOK/introduction/welcome/changelog.xml > =================================================================== > --- trunk/BOOK/introduction/welcome/changelog.xml 2005-07-29 21:24:24 UTC > (rev 4833) > +++ trunk/BOOK/introduction/welcome/changelog.xml 2005-07-29 21:24:30 UTC > (rev 4834) > @@ -25,6 +25,10 @@ > <itemizedlist> > > <listitem> > + <para>July 29th 2005 [bdubbs]: Updated to iptables-1..3.3.</para> > + </listitem> > + > + <listitem> > <para>July 29th 2005 [richard]: Revised wording about LFS > newsserver.</para> > </listitem> > @@ -35,6 +39,7 @@ > </listitem> > > <listitem> > +>>>>>>> .r4832 > <para>July 28th 2005 [richard]: Updated to curl-7.14.0.</para> > </listitem> >
Bruce, You seem to have introduced a strange line into changelog.xml with this one. Possibly one of those things that svm couldn't merge automatically. +>>>>>>> .r4832 R. -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
