remove stray conflict marker
authorNathan Sidwell <nathan@gcc.gnu.org>
Wed, 23 Jun 2004 08:43:25 +0000 (08:43 +0000)
committerNathan Sidwell <nathan@gcc.gnu.org>
Wed, 23 Jun 2004 08:43:25 +0000 (08:43 +0000)
commit60bca1329b31cdbc0feab8d9a2b5f617aee670de
tree2ec4d90d4e1f9ed78e5b445796c1643d947cb410
parentc8619b9056bcb98633301e3c13abb42fa4e027fa
remove stray conflict marker

From-SVN: r83544
gcc/ChangeLog