From: Benjamin Kosnik <bkoz@gcc.gnu.org>
Date: Thu, 10 Apr 2008 20:28:38 +0000 (+0000)
Subject: Changelog: Fix merge bit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=00bf373b67991459464d24c5bc7d7dafc157a364;p=gcc.git

Changelog: Fix merge bit.


2008-04-10  Benjamin Kosnik  <bkoz@redhat.com>

	* Changelog: Fix merge bit.

From-SVN: r134175
---

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.