diff options
| author | R. Kelley Cook <kcook@gcc.gnu.org> | 2004-09-01 00:49:11 +0000 |
|---|---|---|
| committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2004-09-01 00:49:11 +0000 |
| commit | 8af497258e51c85859676aa90587bfe20e7fcafc (patch) | |
| tree | 04c3578679738156571826ab2b94e9ccfe8617f8 /gcc | |
| parent | bee9efbcc7de4e690620684bfc1338bca6f2ce8f (diff) | |
| download | gcc-8af497258e51c85859676aa90587bfe20e7fcafc.zip gcc-8af497258e51c85859676aa90587bfe20e7fcafc.tar.gz gcc-8af497258e51c85859676aa90587bfe20e7fcafc.tar.bz2 | |
Remove stray >>>>>>>
From-SVN: r86860
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ff6249e..67301eb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -212,7 +212,6 @@ * fold-const.c (tree_expr_nonzero_p): Use get_base_address before assuming an ADDR_EXPR is non-null. ->>>>>>> 2.5169 2004-08-30 Jason Merrill <jason@redhat.com> * gthr-posix.h, gthr-dce.h: Add #pragma weaks. |