Commit df839749 by Uros Bizjak

* testsuite/ChangeLog: Remove merge marker.

From-SVN: r239385
parent c73dd986
......@@ -150,8 +150,8 @@
2016-08-09 Martin Jambor <mjambor@suse.cz>
PR ipa/71981
* gcc.dg/ipa/pr71981.c: New test.
PR ipa/71981
* gcc.dg/ipa/pr71981.c: New test.
2016-08-09 Bin Cheng <bin.cheng@arm.com>
......@@ -1106,7 +1106,6 @@
* g++.dg/cpp0x/nullptr35.C (caught): Fix typo.
>>>>>>> .r238890
2016-07-15 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Marco Restelli <mrestelli@gmail.com>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment