* testsuite/ChangeLog: Remove merge marker.
authorUros Bizjak <uros@gcc.gnu.org>
Thu, 11 Aug 2016 19:07:43 +0000 (21:07 +0200)
committerUros Bizjak <uros@gcc.gnu.org>
Thu, 11 Aug 2016 19:07:43 +0000 (21:07 +0200)
commitdf83974966e489c6f080dbd7f479fa12a1d671b2
treecfb350a7e44419140b409d9257101ddbc228616a
parentc73dd9864bb716800209f7fe5e86d95c4a3e9716
* testsuite/ChangeLog: Remove merge marker.

From-SVN: r239385
gcc/testsuite/ChangeLog