Remove conflict indicator
authorkenner <kenner@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 19 Feb 2001 00:10:27 +0000 (00:10 +0000)
committerkenner <kenner@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 19 Feb 2001 00:10:27 +0000 (00:10 +0000)
commit3c52a1bd343c63fb749e12b4afa8654c8350c454
treece65ddc4aaf8734544fac4fc6327ce2500b8b6d5
parent0f623f7e3d918e96cb947e1f36144a2a312a831d
Remove conflict indicator

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