projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4c4809c)
eliminate conflict indicator
authorR. Kelley Cook <kcook@gcc.gnu.org>
Thu, 16 Oct 2003 22:38:32 +0000 (22:38 +0000)
committerR. Kelley Cook <kcook@gcc.gnu.org>
Thu, 16 Oct 2003 22:38:32 +0000 (22:38 +0000)
From-SVN: r72583

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc4e49c38a660b51e42b6573ebbf5e6d61fd2a82..836c8f5c86ad14c6d9e9609569d316b08dcc5630 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -55,7 +55,6 @@
        (machopic_legitimize_pic_address): Improve codegen in dynamic-no-pic
        case.
 
->>>>>>> 2.1435
 2003-10-15  Gábor Lóki  <alga@rgai.hu>
 
        * fold-const.c (tree_swap_operands_p): Disable some features