From: Jonathan Wakely <redi@gcc.gnu.org>
Date: Thu, 23 May 2019 08:46:45 +0000 (+0100)
Subject: Remove conflict marker from ChangeLog
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b636effb6c27c0aec694ba68f115b58f2544844d;p=gcc.git

Remove conflict marker from ChangeLog

From-SVN: r271542
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 26683b82eea..45294c25047 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1975,7 +1975,6 @@ Fix test-suite.
 	and macros.
 	* config/i386/t-i386: Define dependencies for new files.
 
->>>>>>> .r270937
 2019-05-03  Richard Earnshaw  <rearnsha@arm.com>
 
 	PR target/89400