diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-08-03 20:33:52 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-08-03 20:33:52 +0000 |
| commit | b522f768aba8391c18c16353cf42cc576ec88c06 (patch) | |
| tree | af8a7d775180ee48a8e30e93fceee9a9966be981 | |
| parent | 3b0727a0e981692fa3732ad7e13d06abb35c9516 (diff) | |
| download | gcc-b522f768aba8391c18c16353cf42cc576ec88c06.zip gcc-b522f768aba8391c18c16353cf42cc576ec88c06.tar.gz gcc-b522f768aba8391c18c16353cf42cc576ec88c06.tar.bz2 | |
Remove spurious conflict marker
From-SVN: r85499
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4c306f4..9d0199d 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. |