From: Eric Botcazou <ebotcazou@gcc.gnu.org>
Date: Fri, 25 Nov 2016 10:04:20 +0000 (+0000)
Subject: Remove conflict marker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4741b062d65c4af37eba4b1ba5bba11bc95256e1;p=gcc.git

Remove conflict marker

From-SVN: r242871
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d739a6696e9..9e2c4ff0550 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -139,7 +139,6 @@
 	PR target/67822
 	* config/nvptx/mkoffload.c (main): Allow -fopenmp.
 
->>>>>>> .r242853
 2016-11-24  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* common/config/sparc/sparc-common.c (sparc_option_optimization_table):