From: Nathanael Nerode <neroden@gcc.gnu.org>
Date: Tue, 3 Aug 2004 20:33:52 +0000 (+0000)
Subject: Remove spurious conflict marker
X-Git-Tag: releases/gcc-4.0.0~6145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b522f768aba8391c18c16353cf42cc576ec88c06;p=thirdparty%2Fgcc.git

Remove spurious conflict marker

From-SVN: r85499
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c306f4e356e..9d0199dae000 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -28,7 +28,6 @@
 
 	* config/i386/gmm_malloc.h: New file.
 
->>>>>>> 2.4781
 2004-08-03  Dale Johannesen  <dalej@apple.com>
 
 	* config/rs6000/rs6000.c (machopic_output_stub):  Align Darwin stubs.