diff options
| author | Gerald Pfeifer <gerald@gcc.gnu.org> | 2001-09-15 11:51:23 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2001-09-15 11:51:23 +0000 |
| commit | 461c166993aa3bb3022e90451bbadcd24a0d1531 (patch) | |
| tree | 8e6a11b5715606df93721d72e880fbaa72cb06c8 | |
| parent | 068e571426abcce61b16c16542cb5b2111aaffb7 (diff) | |
| download | gcc-461c166993aa3bb3022e90451bbadcd24a0d1531.zip gcc-461c166993aa3bb3022e90451bbadcd24a0d1531.tar.gz gcc-461c166993aa3bb3022e90451bbadcd24a0d1531.tar.bz2 | |
Remove conflict indicators committed as part of revision 1.11335 by
echristo on 15-Sep-01.
From-SVN: r45630
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17ddd38..6ea0c94 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -196,7 +196,6 @@ Fri Sep 14 13:54:50 EDT 2001 John Wehle (john@feith.com) * crti.asm: New file. * crtn.asm: New file. ->>>>>>> 1.11331 2001-09-13 Neil Booth <neil@daikokuya.demon.co.uk> * c-parse.in (_yylex): Use _cpp_backup_tokens. |