From c4c108fec31a4381fe24a647de1fb536b54b4125 Mon Sep 17 00:00:00 2001
From: Larry Lawrence <larry@linuxfromscratch.org>
Date: Thu, 6 Jan 2005 16:49:55 +0000
Subject: [PATCH] fix changlog

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3208 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3ae7b3d7df..e131b3d639 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -32,7 +32,6 @@ commented out second index entry- breaks pdf - for now.</para></listitem>
 Python-2.4.</para></listitem>
 
 <listitem><para>January 5th, 2004 [igor]: Updated to GLib-2.6.0,
->>>>>>> .r3205
 Pango-1.8.0, ATK-1.9.0, libtiff-3.7.1, GTK+-2.6.0 and
 Tcl/Tk-8.4.9.</para></listitem>