From: Aldy Hernandez <aldyh@gcc.gnu.org>
Date: Fri, 20 Jul 2001 10:36:09 +0000 (+0000)
Subject: remove conflicts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8919ea4256496285cabe51686c76c5d6a161b03;p=gcc.git

remove conflicts

From-SVN: r44191
---

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