projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 357480c)
Remove conflict marker
authorMark Mitchell <mmitchel@gcc.gnu.org>
Wed, 9 May 2007 05:31:15 +0000 (05:31 +0000)
committerMark Mitchell <mmitchel@gcc.gnu.org>
Wed, 9 May 2007 05:31:15 +0000 (05:31 +0000)
From-SVN: r124566

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e8282eba07025e9d62fb84e1481c7259293bff8..ba607dc98d5567eaaf6091a58bec2a694698f5fc 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -102,7 +102,6 @@
        * testsuite/23_containers/vector/requirements/dr438/
        constructor_2_neg.cc: Likewise.
 
->>>>>>> .r124554
 2007-05-07  Mark Mitchell  <mark@codesourcery.com>
 
        * testsuite/lib/libstdc++.exp (v3_target_compile_as_c): For