From 1b21d6a00425ba1eaef5124699c1fc8e9d957152 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@gcc.gnu.org>
Date: Tue, 22 Jan 2002 18:35:50 +0000
Subject: [PATCH] fix conflicts

From-SVN: r49083
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb947914c23..85967b4d1c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -120,7 +120,6 @@ Tue Jan 22 06:26:33 2002  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 	(sparc-*-netbsd*): Add netbsd-aout.h to tm_file.
 	(vax-*-netbsd*): Add netbsd-aout.h to tm_file.
 
->>>>>>> 1.12770
 2002-01-21  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* pa-protos.h (reg_before_reload_operand): New function prototype.
-- 
2.30.2