fix conflicts

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67d1cd5..f70bed8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -376,7 +376,6 @@ Tue Mar 19 14:12:32 2002  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
        (movqi): Use gen_lowpart in place of gen_rtx_SUBREG.
        Replace gen_rtx (SUBREG) with gen_rtx_SUBREG.
 
->>>>>>> 1.13452
 2002-03-18  Aldy Hernandez  <aldyh@redhat.com>
 
        * config/rs6000/rs6000.h (PREDICATE_CODES): Add PARALLEL to