From 213dba3e31cf2ef2d14827ba34a224ff2ae7f6cf Mon Sep 17 00:00:00 2001
From: Joern Rennecke <amylaar@gcc.gnu.org>
Date: Mon, 11 Nov 2013 18:40:04 +0000
Subject: Remove ChangeLog merge turd from r204590.

From-SVN: r204680
---
 gcc/testsuite/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7ceba70..b7a8ff8 100644
--- 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.
-- 
cgit v1.1