projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8139829)
Remove '>>>' merge marker from changelog
authorTobias Burnus <burnus@gcc.gnu.org>
Tue, 8 Oct 2019 09:35:56 +0000 (11:35 +0200)
committerTobias Burnus <burnus@gcc.gnu.org>
Tue, 8 Oct 2019 09:35:56 +0000 (11:35 +0200)
From-SVN: r276689

gcc/fortran/ChangeLog patch | blob | history

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 84ee818a49d45f725f3080c9efe3e4a766375752..6e98130dd96a0c3198b556b58b0a369b5bef8df0 100644 (file)
--- 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