Remove conflict indicator.
authorbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 5 Dec 2003 20:53:30 +0000 (20:53 +0000)
committerbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 5 Dec 2003 20:53:30 +0000 (20:53 +0000)
commitde92f6b408e49cb4a0e5de1d44f6d0eafa7dce2c
tree4c4771705149ace778c2da058a3432d3e3d9a2ff
parentfd3638dfcb5df7759c9c5d5b0da82e244acc242e
Remove conflict indicator.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74345 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/ChangeLog