Remove svn conflict marker.
authorDavid Edelsohn <dje@gcc.gnu.org>
Thu, 1 Dec 2016 13:48:22 +0000 (08:48 -0500)
committerDavid Edelsohn <dje@gcc.gnu.org>
Thu, 1 Dec 2016 13:48:22 +0000 (08:48 -0500)
commit8e9c33cd3bd55c2364a2efc7fc2de0957d7b991d
tree58beccd67788802125771b0f5150dd48fe1975f0
parent825fba526ce816bd26887457e2f0f4ca05b1ccdd
Remove svn conflict marker.

From-SVN: r243110
gcc/ChangeLog