fix merge conflict in libgfortran/ChangeLog
authorJanne Blomqvist <jb@gcc.gnu.org>
Wed, 29 Nov 2017 09:01:49 +0000 (11:01 +0200)
committerJanne Blomqvist <jb@gcc.gnu.org>
Wed, 29 Nov 2017 09:01:49 +0000 (11:01 +0200)
commit8801187868ac319744b6cd55ca3a1f37502d538f
tree8a2236831b2786c2ce2c47f8d84ccf17be7a684e
parent4c42d640b2087d86da862a6c38a2687dfa4e3efc
fix merge conflict in libgfortran/ChangeLog

From-SVN: r255227
libgfortran/ChangeLog