projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc4a37e)
Fix garbage.
authorJerry DeLisle <jvdelisle@gcc.gnu.org>
Fri, 31 Oct 2008 04:53:00 +0000 (04:53 +0000)
committerJerry DeLisle <jvdelisle@gcc.gnu.org>
Fri, 31 Oct 2008 04:53:00 +0000 (04:53 +0000)
From-SVN: r141490

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e8f09119a6316d7fe8e162688297bb14e1cbe46f..e97b60fbf242f4fed020e8547a45a09528562dfc 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