From: R. Kelley Cook <kcook@gcc.gnu.org>
Date: Wed, 1 Sep 2004 00:49:11 +0000 (+0000)
Subject: Remove stray >>>>>>>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8af497258e51c85859676aa90587bfe20e7fcafc;p=gcc.git

Remove stray >>>>>>>

From-SVN: r86860
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff6249eefef..67301eb8157 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.