Skip to content

R
riscv-gcc-1
Commit d7aa3e1e by Zack Weinberg
Options

Remove stray conflict marker 

From-SVN: r46386
parent a4017847
Showing with 0 additions and 1 deletions
gcc/ChangeLog
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment