projects / platform / upstream / linaro-gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dd6b3fc)
2010-10-05 Jonathan Wakely <jwakely.gcc@gmail.com>
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 5 Oct 2010 20:43:04 +0000 (20:43 +0000)
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 5 Oct 2010 20:43:04 +0000 (20:43 +0000)
* Remove svn conflict marker in ChangeLog.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165001 138bc75d-0d04-0410-961f-82ee72b054a4

libstdc++-v3/ChangeLog patch | blob | history

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c38d749..b6c4aca 100644 (file)
--- 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
Domain: System / Toolchain;