tree 5f0df761f4c8790213b7310a518d064e4d4385d1
parent 6b8c51083f174263d57154d530e1f903e0437941
author redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> 1558601205 +0000
committer redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> 1558601205 +0000

Remove conflict marker from ChangeLog

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