Remove conflict indicator.
authorPer Bothner <bothner@gcc.gnu.org>
Fri, 5 Dec 2003 20:53:30 +0000 (12:53 -0800)
committerPer Bothner <bothner@gcc.gnu.org>
Fri, 5 Dec 2003 20:53:30 +0000 (12:53 -0800)
commit07a3c905b3608f7631f6e146b77fda01daddaea5
tree4c4771705149ace778c2da058a3432d3e3d9a2ff
parent7d40b45fcb203d60c6d116d814016a0abe814825
Remove conflict indicator.

From-SVN: r74345
gcc/ChangeLog