r4835 - trunk/BOOK/introduction/welcome

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Fri Jul 29 15:03:33 PDT 2005


Author: bdubbs
Date: 2005-07-29 16:03:32 -0600 (Fri, 29 Jul 2005)
New Revision: 4835

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Remove svn conflict marker

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-07-29 21:24:30 UTC (rev 4834)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-07-29 22:03:32 UTC (rev 4835)
@@ -39,7 +39,6 @@
     </listitem>
   
     <listitem>
->>>>>>> .r4832
       <para>July 28th 2005 [richard]: Updated to curl-7.14.0.</para>
     </listitem>
     




More information about the blfs-book mailing list