From 2b4514101fc315ce7d069ff8476b2dd8251a4223 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pekka=20J=C3=A4=C3=A4skel=C3=A4inen?= <visit0r@gcc.gnu.org>
Date: Thu, 4 May 2017 05:56:32 +0000
Subject: [PATCH] Removed accidentally committed conflict marker.

From-SVN: r247577
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ab62c6a919..6a7bda48c92 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -76,7 +76,6 @@
 	* ipa-inline.h (inline_summary): Add ctor.
 	(create_ggc): Do not use ggc_cleared_alloc.
 
->>>>>>> .r247575
 2017-05-03  Jeff Downs  <heydowns@somuchpressure.net>
 	    Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
-- 
2.30.2