diff options
author | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-29 11:01:49 +0200 |
---|---|---|
committer | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-29 11:01:49 +0200 |
commit | 8801187868ac319744b6cd55ca3a1f37502d538f (patch) | |
tree | 8a2236831b2786c2ce2c47f8d84ccf17be7a684e /gcc | |
parent | 4c42d640b2087d86da862a6c38a2687dfa4e3efc (diff) | |
download | gcc-8801187868ac319744b6cd55ca3a1f37502d538f.zip gcc-8801187868ac319744b6cd55ca3a1f37502d538f.tar.gz gcc-8801187868ac319744b6cd55ca3a1f37502d538f.tar.bz2 |
fix merge conflict in libgfortran/ChangeLog
From-SVN: r255227
Diffstat (limited to 'gcc')
0 files changed, 0 insertions, 0 deletions