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

Remove stray conflict marker 

From-SVN: r46386
This commit is contained in:
Zack Weinberg 2001-10-20 18:16:32 +00:00
parent a4017847d5
commit d7aa3e1e9a
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

@ -90,7 +90,6 @@ Sat Oct 20 12:01:07 CEST 2001 Jan Hubicka <jh@suse.cz>
call run_directive directly.
(_cpp_do__Pragma): Simplify.
>>>>>>> 1.11604
2001-10-19 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* pe.c (arm_pe_unique_section): Const-ify.