From: Aldy Hernandez <aldyh@gcc.gnu.org>
Date: Thu, 21 Mar 2002 23:16:17 +0000 (+0000)
Subject: fix conflicts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18523b2c8ec990617ecd4b22be3e4da5b34a0215;p=gcc.git

fix conflicts

From-SVN: r51147
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67d1cd59924..f70bed8a301 100644
--- 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