Remove conflict marker.
authorAndreas Schwab <schwab@gcc.gnu.org>
Fri, 23 Jun 2006 09:41:38 +0000 (09:41 +0000)
committerAndreas Schwab <schwab@gcc.gnu.org>
Fri, 23 Jun 2006 09:41:38 +0000 (09:41 +0000)
commit410ed785dd9560b052318fe9bd4f41cdc12ef7ed
tree4b1223fcbb77a068f74b1b3e9474e90eb5b97e80
parent4e2bb0a4b816a3dc9dbcd871c6ad8e9c678146a5
Remove conflict marker.

From-SVN: r114928
gcc/ChangeLog