Remove stray >>>>>>>

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86860 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff6249e..67301eb 100644 (file)
--- 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.