diff options
Diffstat (limited to 'libstdc++-v3/ChangeLog')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2e8282eba07..ba607dc98d5 100644 --- 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 |