Remove conflict marker.
authorAndreas Schwab <schwab@gcc.gnu.org>
Wed, 16 Jun 2004 10:45:58 +0000 (10:45 +0000)
committerAndreas Schwab <schwab@gcc.gnu.org>
Wed, 16 Jun 2004 10:45:58 +0000 (10:45 +0000)
commit58b9accaebab8fc4ee05a52f6698c24e8bfa65e2
treec5c381c1780c7f554d92b4a9a7f6bcae8264b5c8
parentbf9a420e62f4f6993daa8b581a6d4ec28ace4730
Remove conflict marker.

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