diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2019-10-08 09:35:56 +0000 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2019-10-08 09:35:56 +0000 |
| commit | 6c5f55785933e4eee08bf99d72b560f8a9e73ea9 (patch) | |
| tree | a5397bdeb310a5366472b578d2b3b5abbbbdde9a | |
| parent | 43b8dfcb775579c724e63e1fe046b0c6e65b99e2 (diff) | |
Remove '>>>' merge marker from changelog
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@276689 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 84ee818a49d..6e98130dd96 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 |