From: Nathan Sidwell <nathan@gcc.gnu.org>
Date: Wed, 21 May 2003 11:14:22 +0000 (+0000)
Subject: remove conflict marker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6aeed3e155be801f9ed019cc91f922e97958368c;p=gcc.git

remove conflict marker

From-SVN: r67059
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4dc4a1d0ce9..2e75ec468ac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -158,7 +158,6 @@
 	* doc/invoke.texi (Option Summary, PowerPC Options): Document
 	new options.
 
->>>>>>> 1.17889
 2003-05-19  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* c-decl.c (finish_decl): When setting the DECL_ASSEMBLER_NAME