[pkgsrc/trunk]: pkgsrc/lang/perl58 Fix conflicts.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7214a30b6e00
branches:  trunk
changeset: 474184:7214a30b6e00
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Apr 26 04:42:40 2004 +0000

description:
Fix conflicts.

diffstat:

 lang/perl58/distinfo |  10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diffs (20 lines):

diff -r 8ddb3edc2811 -r 7214a30b6e00 lang/perl58/distinfo
--- a/lang/perl58/distinfo      Mon Apr 26 04:42:12 2004 +0000
+++ b/lang/perl58/distinfo      Mon Apr 26 04:42:40 2004 +0000
@@ -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