Remove spurious conflict marker

From-SVN: r85499

Remove spurious conflict marker
From-SVN: r85499
b522f768 · Nathanael Nerode · 3b0727a0 · b522f768
Commit b522f768 authored Aug 03, 2004 by Nathanael Nerode
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- 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.