From 32584f728620e9fa6e514581f693b62f1ac7efd4 Mon Sep 17 00:00:00 2001
From: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date: Fri, 31 Oct 2008 04:53:00 +0000
Subject: [PATCH] Fix garbage.

From-SVN: r141490
---
 gcc/testsuite/ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e8f09119a631..e97b60fbf242 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,10 +1,8 @@
-<<<<<<< .mine
 2008-10-30  Steven G. Kargl  <kargls@comcast.net>
 
 	PR fortran/37930
 	* gfortran.dg/int_conv_2.f90:  New test.
 
-=======
 2008-10-30  Mikael Morin  <mikael.morin@tele2.fr>
 
         PR fortran/37903
@@ -15,7 +13,6 @@
         PR fortran/37749
         * gfortran.dg/vector_subscript__5.f90: New test.
 
->>>>>>> .r141488
 2008-10-30  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.target/s390/pr36822.c: Avoid cast to pointer from integer