From d198e607e915a6047b73f025964a1de8c5b09de9 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 26 Apr 2004 04:42:40 +0000
Subject: Fix conflicts.

---
 lang/perl58/distinfo | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'lang')

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
-- 
cgit v1.2.3