Remove conflict markers from perl tests
authorafresh1 <afresh1@openbsd.org>
Tue, 21 Feb 2023 02:20:35 +0000 (02:20 +0000)
committerafresh1 <afresh1@openbsd.org>
Tue, 21 Feb 2023 02:20:35 +0000 (02:20 +0000)
commit2266fceeb92c0fed277a6107be3c6c0d1b7ea712
tree9d8eeafd39ff76cee96e16201db3b4ddf4f8c8a6
parentd7414e2de92eb42e396a2066b582b1590b210827
Remove conflict markers from perl tests

This is upstream PR 28103 https://github.com/Perl/perl5/pull/20813

Requested by stsp@ for quality of life improvments for Game of Trees users.
gnu/usr.bin/perl/t/comp/parser.t
gnu/usr.bin/perl/t/lib/croak/toke
gnu/usr.bin/perl/t/test.pl