From: David Edelsohn <dje@gcc.gnu.org>
Date: Tue, 21 May 2013 23:08:28 +0000 (-0400)
Subject: - Remove SVN merge marker.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b0f6005b1ea2a1f2f4d4e534d8e1f7f1c7c09969;p=gcc.git

- Remove SVN merge marker.

From-SVN: r199167
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dcb69cbd98..c43d82034fc 100644
--- 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.