projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 991df44)
Remove stray conflict marker.
authorBen Elliston <bje@gcc.gnu.org>
Wed, 15 Aug 2007 00:40:52 +0000 (10:40 +1000)
committerBen Elliston <bje@gcc.gnu.org>
Wed, 15 Aug 2007 00:40:52 +0000 (10:40 +1000)
From-SVN: r127504

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11d3ad8e2a59aa55fbc06b01b2292f34ef5fff0b..bc335714d71ed69d82fbcc1ba2e17b7dc7f022a3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -404,7 +404,6 @@
        * emit-rtl.c (try_split): Relink the insns with REG_LIBCALL note
        and with REG_RETVAL note after split.
 
->>>>>>> .r127481
 2007-08-11  David Daney  <ddaney@avtrex.com>
 
        * config/mips/mips.c (mips_sched_reorder):  Mark cycle parameter