diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3877bc30ac1..838bf2e03f0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -253,7 +253,6 @@
 	* doc/xml/manual/parallel_mode.xml: Correct configuration documentation.
 	* doc/html/manual/bk01pt12ch31s04.html: Regenerate.
 
->>>>>>> .r133664
 2008-03-18  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* configure.ac (libtool_VERSION): To 6:11:0.