Changelog: Fix merge bit.

2008-04-10 Benjamin Kosnik <bkoz@redhat.com> * Changelog: Fix merge bit. From-SVN: r134175

Changelog: Fix merge bit.
2008-04-10 Benjamin Kosnik <bkoz@redhat.com> * Changelog: Fix merge bit. From-SVN: r134175
00bf373b · Benjamin Kosnik · d466a7e2 · 00bf373b
Commit 00bf373b authored 17 years ago by Benjamin Kosnik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

libstdc++-v3/ChangeLog
+0 -1

No files found.
--- 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.