projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d8cc3d0)
Remove conflict marker
authorEric Botcazou <ebotcazou@gcc.gnu.org>
Fri, 25 Nov 2016 10:04:20 +0000 (10:04 +0000)
committerEric Botcazou <ebotcazou@gcc.gnu.org>
Fri, 25 Nov 2016 10:04:20 +0000 (10:04 +0000)
From-SVN: r242871

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d739a6696e94b2325994570485d46ed4e28d2b4e..9e2c4ff0550324e6aae1a3df981b7b89d1601fce 100644 (file)
--- 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):