Commit 5cfa327d by Tobias Burnus

Remove '>>>' merge marker from changelog

From-SVN: r276689
parent 81398293
...@@ -153,7 +153,6 @@ ...@@ -153,7 +153,6 @@
(lang_decl): Add new optional_arg field. (lang_decl): Add new optional_arg field.
(GFC_DECL_OPTIONAL_ARGUMENT): New macro. (GFC_DECL_OPTIONAL_ARGUMENT): New macro.
>>>>>>> .r276463
2019-10-01 David Malcolm <dmalcolm@redhat.com> 2019-10-01 David Malcolm <dmalcolm@redhat.com>
* error.c (gfc_diagnostic_starter): Clear the prefix before * error.c (gfc_diagnostic_starter): Clear the prefix before
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment