Remove ChangeLog merge turd from r204590.

From-SVN: r204680

Remove ChangeLog merge turd from r204590.
From-SVN: r204680
213dba3e · Joern Rennecke · 64c7b4c0 · 213dba3e
Commit 213dba3e authored Nov 11, 2013 by Joern Rennecke
Hide 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
@@ -83,7 +83,6 @@
 	gcc.dg/c11-atomic-2.c, gcc.dg/c11-atomic-3.c,
 	gcc.dg/c90-atomic-1.c, gcc.dg/c99-atomic-1.c: New tests.

->>>>>>> .r204589
 2013-11-07  Cong Hou  <congh@google.com>

 	* gcc.dg/vect/vect-alias-check.c: New.