r242871 - /trunk/gcc/ChangeLog

[ebotcazou@gcc.gnu.org]

Author: ebotcazou
Date: Fri Nov 25 10:04:20 2016
New Revision: 242871

URL: https://gcc.gnu.org/viewcvs?rev=242871&root=gcc&view=rev
Log:
Remove conflict marker

Modified:
    trunk/gcc/ChangeLog