OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove spurious conflict marker 

From-SVN: r85499
This commit is contained in:
Nathanael Nerode 2004-08-03 20:33:52 +00:00
parent 3b0727a0e9
commit b522f768ab
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/ChangeLog
View File

@ -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.