projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bee9efb)
Remove stray >>>>>>>
authorR. Kelley Cook <kcook@gcc.gnu.org>
Wed, 1 Sep 2004 00:49:11 +0000 (00:49 +0000)
committerR. Kelley Cook <kcook@gcc.gnu.org>
Wed, 1 Sep 2004 00:49:11 +0000 (00:49 +0000)
From-SVN: r86860

gcc/ChangeLog patch | blob | history

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