From: David Edelsohn <dje@gcc.gnu.org>
Date: Thu, 1 Dec 2016 13:48:22 +0000 (-0500)
Subject: Remove svn conflict marker.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e9c33cd3bd55c2364a2efc7fc2de0957d7b991d;p=gcc.git

Remove svn conflict marker.

From-SVN: r243110
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a164a01cadf..4d15a7308db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -38,7 +38,6 @@
 	PR rtl-optimization/78607
 	* combine.c (try_combine): Emit a barrier after a unconditional trap.
 
->>>>>>> .r243107
 2016-11-30  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/78602