From 221c425b9b2044ff5456aa58454c8fab061a6bc8 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Sun, 12 Nov 2006 14:26:47 +0000
Subject: regen

---
 cad/xcircuit/distinfo | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'cad')

diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index c7fa05af0a8..f0f5c4f734d 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.11 2006/11/12 14:25:50 dmcmahill Exp $
+$NetBSD: distinfo,v 1.12 2006/11/12 14:26:47 dmcmahill Exp $
 
-<<<<<<< distinfo
 SHA1 (xcircuit-3.4.26.tgz) = cf3eda5c788376a09cca6a35ee120a3f12a08c33
 RMD160 (xcircuit-3.4.26.tgz) = fd9beb37f16670505ee9aadc394d6e722947d645
 Size (xcircuit-3.4.26.tgz) = 1054942 bytes
-=======
-SHA1 (xcircuit-3.3.0.tgz) = ec3c0995fd4f8755a50d39e278ca0ab293705b38
-RMD160 (xcircuit-3.3.0.tgz) = 2f3621b5201ce4597a34a300a7111349825e3045
-Size (xcircuit-3.3.0.tgz) = 1308602 bytes
->>>>>>> 1.10
 SHA1 (patch-aa) = 8ac2a3398cbd74ca0248737c753816dee4367f97
 SHA1 (patch-ab) = 71335b954491e2d45a2189f6e1579c36dd401563
 SHA1 (patch-ac) = 5921bc94c2288f6d1811fe5a72f136a0ef0f25e6
-- 
cgit v1.2.3