Fix garbage.

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

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