Remove conflict marker.
authorMatt Kraai <kraai@gcc.gnu.org>
Fri, 30 May 2003 00:50:32 +0000 (00:50 +0000)
committerMatt Kraai <kraai@gcc.gnu.org>
Fri, 30 May 2003 00:50:32 +0000 (00:50 +0000)
commit61d74548d6cb79c73d787f43835effe6f272991a
treebd948859aa9f0f0927ed54491077fb48c79e211a
parent8fdf766886512c1558c3d7d3604c25d00fb8c943
Remove conflict marker.

From-SVN: r67239
gcc/ChangeLog