Remove conflict marker
authorEric Botcazou <ebotcazou@gcc.gnu.org>
Fri, 25 Nov 2016 10:04:20 +0000 (10:04 +0000)
committerEric Botcazou <ebotcazou@gcc.gnu.org>
Fri, 25 Nov 2016 10:04:20 +0000 (10:04 +0000)
commit4741b062d65c4af37eba4b1ba5bba11bc95256e1
treeac2bab7dc46195daba27377d117043fe751612cd
parentd8cc3d06f8e365f8c175fbf2923ed15d78ca8510
Remove conflict marker

From-SVN: r242871
gcc/ChangeLog