Skip to content

R
riscv-gcc-1
Commit 2b451410 by Pekka Jääskeläinen
Options

Removed accidentally committed conflict marker. 

From-SVN: r247577
parent c6e334cd
Showing with 0 additions and 1 deletions
gcc/ChangeLog
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
* ipa-inline.h (inline_summary): Add ctor. * ipa-inline.h (inline_summary): Add ctor.
(create_ggc): Do not use ggc_cleared_alloc. (create_ggc): Do not use ggc_cleared_alloc.
>>>>>>> .r247575
2017-05-03 Jeff Downs <heydowns@somuchpressure.net> 2017-05-03 Jeff Downs <heydowns@somuchpressure.net>
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
......
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