Fix merge conflict.
authorBenjamin Kosnik <bkoz@gcc.gnu.org>
Sat, 9 Aug 2003 01:43:18 +0000 (01:43 +0000)
committerBenjamin Kosnik <bkoz@gcc.gnu.org>
Sat, 9 Aug 2003 01:43:18 +0000 (01:43 +0000)
commit0f492da1c87dd54dacd50dbdd02671ae751cf89c
tree6a604cc43d95e0f81de4a2844ba154143a46a53e
parent561af708f99565ea6974718b6748a3ef59e5c5ca
Fix merge conflict.

From-SVN: r70269
libstdc++-v3/ChangeLog