diff options
| author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-08-09 01:43:18 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-08-09 01:43:18 +0000 |
| commit | 0f492da1c87dd54dacd50dbdd02671ae751cf89c (patch) | |
| tree | 6a604cc43d95e0f81de4a2844ba154143a46a53e /libstdc++-v3 | |
| parent | 561af708f99565ea6974718b6748a3ef59e5c5ca (diff) | |
| download | gcc-0f492da1c87dd54dacd50dbdd02671ae751cf89c.tar.gz | |
Fix merge conflict.
From-SVN: r70269
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 2f0d775cd13..a8faf991aba 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -333,7 +333,6 @@ * testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc: Same. ->>>>>>> 1.1912 2003-07-28 Phil Edwards <pme@gcc.gnu.org> * docs/doxygen/user.cfg.in, docs/html/abi.txt, docs/html/debug.html, |