Removed accidentally committed conflict marker.
authorPekka Jääskeläinen <visit0r@gcc.gnu.org>
Thu, 4 May 2017 05:56:32 +0000 (05:56 +0000)
committerPekka Jääskeläinen <visit0r@gcc.gnu.org>
Thu, 4 May 2017 05:56:32 +0000 (05:56 +0000)
commit2b4514101fc315ce7d069ff8476b2dd8251a4223
treee26fffca2dc3d64f071375c3ba33bbbe4efe453e
parentc6e334cdb1177c9722cef5e5f7153986edd5e5d3
Removed accidentally committed conflict marker.

From-SVN: r247577
gcc/ChangeLog