diff options
| author | mmitchel <> | 2007-05-09 04:31:15 +0000 |
|---|---|---|
| committer | mmitchel <> | 2007-05-09 04:31:15 +0000 |
| commit | f262d92a154d047835965cf484ea42be599b8f11 (patch) | |
| tree | 07f73d4143c12edd46d725b51c407365156dc3be | |
| parent | 14e1d8d7829694c604cbf8661f5818d81ab60978 (diff) | |
Remove conflict marker
| -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 |