From: Wolfgang Bangerth <bangerth@gcc.gnu.org>
Date: Thu, 15 May 2003 15:02:27 +0000 (-0600)
Subject: Remove the residuals of a previous merge conflict.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce000d1eec7bc89409426551325a1ac6ba233193;p=gcc.git

Remove the residuals of a previous merge conflict.

From-SVN: r66826
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4ffd196eb76..5d4be0bc64c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -587,7 +587,6 @@ Mon May 12 11:32:53 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	(s390_function_arg): Likewise.
 	(s390_va_arg): Likewise
 
->>>>>>> 1.17806
 2003-05-11  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* coverage.h (coverage_counter_alloc): New function.