OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove '>>>' merge marker from changelog

Browse Source 
From-SVN: r276689
This commit is contained in:
Tobias Burnus 2019-10-08 11:35:56 +02:00
parent 813982933f
commit 5cfa327dc0
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/fortran/ChangeLog
View File

@ -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