Remove ChangeLog merge turd from r204590.

From-SVN: r204680

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7ceba70..b7a8ff8 100644 (file)
--- 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.