From e8919ea4256496285cabe51686c76c5d6a161b03 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@gcc.gnu.org>
Date: Fri, 20 Jul 2001 10:36:09 +0000
Subject: [PATCH] remove conflicts

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc8edcd342b..51df8fed28a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -125,7 +125,6 @@
 	previous args.
 	(copy_object): Caller changed.
 
->>>>>>> 1.10722
 2001-07-19  Andreas Schwab  <schwab@suse.de>
 
 	* configure.in (assembler dwarf2 debug_line support): Define nop
-- 
2.30.2