From 26796ffd3bb08b9c0b4fd6b99e8da56b4bc9aa1d Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl@gcc.gnu.org>
Date: Tue, 30 Oct 2007 10:54:29 -0700
Subject: [PATCH] Remove ">>>>>>> .r129772".

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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0956218a981..9e385c4511f 100644
--- 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.
-- 
2.30.2