diff options
| author | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2016-11-25 10:04:20 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2016-11-25 10:04:20 +0000 |
| commit | 4741b062d65c4af37eba4b1ba5bba11bc95256e1 (patch) | |
| tree | ac2bab7dc46195daba27377d117043fe751612cd | |
| parent | d8cc3d06f8e365f8c175fbf2923ed15d78ca8510 (diff) | |
| download | gcc-4741b062d65c4af37eba4b1ba5bba11bc95256e1.zip gcc-4741b062d65c4af37eba4b1ba5bba11bc95256e1.tar.gz gcc-4741b062d65c4af37eba4b1ba5bba11bc95256e1.tar.bz2 | |
Remove conflict marker
From-SVN: r242871
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d739a66..9e2c4ff 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): |