* testsuite/ChangeLog: Remove merge marker.

From-SVN: r239385

* testsuite/ChangeLog: Remove merge marker.
From-SVN: r239385
df839749 · Uros Bizjak · c73dd986 · df839749
Commit df839749 authored Aug 11, 2016 by Uros Bizjak
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/testsuite/ChangeLog
+0 -1

No files found.
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -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>