Remove ">>>>>>> .r129772".

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129777 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0956218..9e385c4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -15,7 +15,6 @@
        * gcc.c-torture/execute/20071030-1.c: New testcase copied from
        gcc.target/i386/loop-3.c.
 
->>>>>>> .r129772
 2007-10-30  Revital Eres  <eres@il.ibm.com>
 
        * testsuite/gcc.dg/vect/pr33866.c: Require vect_long.