Oops. forgot to kill the >>> from the conflict.
authorRichard Henderson <rth@gcc.gnu.org>
Tue, 25 Aug 1998 12:24:31 +0000 (05:24 -0700)
committerRichard Henderson <rth@gcc.gnu.org>
Tue, 25 Aug 1998 12:24:31 +0000 (05:24 -0700)
commit8239d6c313265003e2d28bd4b7fdd0b613ce5635
treef4cd6d44da305089ec5b27ba6c3c09624d648861
parent91bb873f6a9999799bfc4242b9bd4e13c47bf820
Oops.  forgot to kill the >>> from the conflict.

From-SVN: r21969
gcc/ChangeLog