From: burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 8 Oct 2019 09:35:56 +0000 (+0000)
Subject: Remove '>>>' merge marker from changelog
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4958da0be3f08d5f715dc4b74a8e93db18ca1a9e;p=thirdparty%2Fgcc.git

Remove '>>>' merge marker from changelog


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276689 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 84ee818a49d4..6e98130dd96a 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