Remove spurious conflict marker

From-SVN: r85499

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c306f4e356ebb5d957d793df3e57f87ab836fd0..9d0199dae000756516a61d4caa77e36cbc0c20af 100644 (file)
--- 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.