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

Remove conflict indicators committed as part of revision 1.11335 by 

echristo on 15-Sep-01.

From-SVN: r45630
This commit is contained in:
Gerald Pfeifer 2001-09-15 11:51:23 +00:00
parent 068e571426
commit 461c166993
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

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