Remove conflict marker from ChangeLog
authorJonathan Wakely <redi@gcc.gnu.org>
Thu, 23 May 2019 08:46:45 +0000 (09:46 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Thu, 23 May 2019 08:46:45 +0000 (09:46 +0100)
commitb636effb6c27c0aec694ba68f115b58f2544844d
tree5f0df761f4c8790213b7310a518d064e4d4385d1
parentcf9847d25f1ca8998725ce1807e8bca23b11832e
Remove conflict marker from ChangeLog

From-SVN: r271542
gcc/ChangeLog