diff options
| author | Tobias Burnus <burnus@gcc.gnu.org> | 2019-10-08 11:35:56 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2019-10-08 11:35:56 +0200 |
| commit | 5cfa327dc009e429da3711680ab10122763417a3 (patch) | |
| tree | a5397bdeb310a5366472b578d2b3b5abbbbdde9a | |
| parent | 813982933f392afe8779da466bf0c034fab66ac8 (diff) | |
| download | gcc-5cfa327dc009e429da3711680ab10122763417a3.zip gcc-5cfa327dc009e429da3711680ab10122763417a3.tar.gz gcc-5cfa327dc009e429da3711680ab10122763417a3.tar.bz2 | |
Remove '>>>' merge marker from changelog
From-SVN: r276689
| -rw-r--r-- | gcc/fortran/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 84ee818..6e98130 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -153,7 +153,6 @@ (lang_decl): Add new optional_arg field. (GFC_DECL_OPTIONAL_ARGUMENT): New macro. ->>>>>>> .r276463 2019-10-01 David Malcolm <dmalcolm@redhat.com> * error.c (gfc_diagnostic_starter): Clear the prefix before |