Skip to content

R
riscv-gcc-1
Commit 8af49725 by R. Kelley Cook
Options

Remove stray >>>>>>> 

From-SVN: r86860
parent bee9efbc
Showing with 0 additions and 1 deletions
gcc/ChangeLog
...@@ -212,7 +212,6 @@ ...@@ -212,7 +212,6 @@
* fold-const.c (tree_expr_nonzero_p): Use get_base_address before * fold-const.c (tree_expr_nonzero_p): Use get_base_address before
assuming an ADDR_EXPR is non-null. assuming an ADDR_EXPR is non-null.
>>>>>>> 2.5169
2004-08-30 Jason Merrill <jason@redhat.com> 2004-08-30 Jason Merrill <jason@redhat.com>
* gthr-posix.h, gthr-dce.h: Add #pragma weaks. * gthr-posix.h, gthr-dce.h: Add #pragma weaks.
......
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