projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4cbc4bd)
- Remove SVN merge marker.
authorDavid Edelsohn <dje@gcc.gnu.org>
Tue, 21 May 2013 23:08:28 +0000 (19:08 -0400)
committerDavid Edelsohn <dje@gcc.gnu.org>
Tue, 21 May 2013 23:08:28 +0000 (19:08 -0400)
From-SVN: r199167

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dcb69cbd98c12f336ed3a00f08127c39dae269b..c43d82034fc7565862db8ac541d0011fd11621ee 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -52,7 +52,6 @@
        * config/sh/sh.md (fmasf4): Remove empty constraints strings.
        (*fmasf4, *fmasf4_media): New insns.
 
->>>>>>> .r199151
 2013-05-19  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * config/mips/mips.h (BASE_INSN_LENGTH, NOP_INSN_LENGTH): New macros.