diff options
| author | Vlad Glagolev | 2015-05-01 10:00:05 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-05-02 09:50:26 +0300 |
| commit | 0f0160f3a3ed7ce41cac0cd9a4ec17a2ae2166d0 (patch) | |
| tree | 39817be1c78c594ba4dfe3a949accb285a21ec78 | |
| parent | f3ccec7b634929ddee5035db30a17eff8f85f4cd (diff) | |
test-harness: conflicts with modern perl
(cherry picked from commit 16dd83bd1563d5aac6d8ce14429309fc04b2e9d6)
| -rwxr-xr-x | perl-cpan/test-harness/CONFLICTS | 1 | ||||
| -rw-r--r-- | perl-cpan/test-harness/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-cpan/test-harness/CONFLICTS b/perl-cpan/test-harness/CONFLICTS new file mode 100755 index 0000000000..9ae5303388 --- /dev/null +++ b/perl-cpan/test-harness/CONFLICTS @@ -0,0 +1 @@ +conflicts perl y diff --git a/perl-cpan/test-harness/HISTORY b/perl-cpan/test-harness/HISTORY index 0327d5db5c..f3ac3f0a35 100644 --- a/perl-cpan/test-harness/HISTORY +++ b/perl-cpan/test-harness/HISTORY @@ -1,3 +1,6 @@ +2015-05-01 Vlad Glagolev <stealth@sourcemage.org> + * CONFLICTS: added, included with perl core since 5.8.1 + 2008-01-07 Vlad Glagolev <stealth@sourcemage.org> * BUILD: useless |