Remove '>>>' merge marker from changelog

From-SVN: r276689

Remove '>>>' merge marker from changelog
From-SVN: r276689
5cfa327d · Tobias Burnus · 81398293 · 5cfa327d
Commit 5cfa327d authored Oct 08, 2019 by Tobias Burnus
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/fortran/ChangeLog
+0 -1

No files found.
--- 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