Remove conflict marker.
authorAndreas Schwab <schwab@gcc.gnu.org>
Wed, 12 Oct 2005 13:40:05 +0000 (13:40 +0000)
committerAndreas Schwab <schwab@gcc.gnu.org>
Wed, 12 Oct 2005 13:40:05 +0000 (13:40 +0000)
commit985943dfe64b14493be29f112a62d1fc9ead7186
tree770034cb1206345f862c81b0eb95114ceed0d12b
parent39e837db6aa45f28e5c1fe314b16d1dcaa8c99ab
Remove conflict marker.

From-SVN: r105301
gcc/ChangeLog