diff options
| author | jlam <jlam> | 2004-04-26 04:42:40 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-04-26 04:42:40 +0000 |
| commit | d198e607e915a6047b73f025964a1de8c5b09de9 (patch) | |
| tree | 86232819b1c74dd5bfc963af657bc9c39b351674 /lang | |
| parent | 6f00833834e68c45a9ab5718a4081190ea2bfd2f (diff) | |
| download | pkgsrc-d198e607e915a6047b73f025964a1de8c5b09de9.tar.gz | |
Fix conflicts.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl58/distinfo | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo index a4cd98cbcc7..7d9dc8935e0 100644 --- a/lang/perl58/distinfo +++ b/lang/perl58/distinfo @@ -1,15 +1,7 @@ -$NetBSD: distinfo,v 1.16 2004/04/26 04:42:12 jlam Exp $ +$NetBSD: distinfo,v 1.17 2004/04/26 04:42:40 jlam Exp $ -<<<<<<< distinfo SHA1 (perl-5.8.4.tar.bz2) = c5ea4952f42b0505268863dc607058b39cfcd4b6 Size (perl-5.8.4.tar.bz2) = 9598489 bytes -======= -SHA1 (perl-5.8.3.tar.gz) = 4c6f2aaa1b3a1d44535a1b54738d494e8fb90222 -Size (perl-5.8.3.tar.gz) = 12002329 bytes ->>>>>>> 1.15 -<<<<<<< distinfo -======= ->>>>>>> 1.15 SHA1 (patch-aa) = a441cba11b12a4285284e98b6e5918efbd8bafef SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80 SHA1 (patch-ah) = b5b65b219c3d088bca2d46d833bc0afb62d5e727 |