aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c38d749..b6c4aca 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -145,7 +145,6 @@
* configure: Regenerate.
* include/Makefile.in: Likewise.
->>>>>>> .r164755
2010-09-22 David Krauss <potswa@mac.com>
PR libstdc++/45628