This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Resolve merge conflict
authorSawyer X <xsawyerx@cpan.org>
Fri, 24 May 2019 22:18:57 +0000 (01:18 +0300)
committerSawyer X <xsawyerx@cpan.org>
Fri, 24 May 2019 22:18:57 +0000 (01:18 +0300)

Trivial merge