diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-09 05:31:15 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-09 05:31:15 +0000 |
| commit | 3222aa3bb627c750183ea4aa79abd72a3abd6a83 (patch) | |
| tree | 07f73d4143c12edd46d725b51c407365156dc3be /libstdc++-v3 | |
| parent | 5e3dac22b7b985d55c5ed6ef9cf53d719e8ca420 (diff) | |
| download | gcc-3222aa3bb627c750183ea4aa79abd72a3abd6a83.tar.gz | |
Remove conflict marker
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124566 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 |