diff options
| author | rillig <rillig@pkgsrc.org> | 2016-03-19 00:32:10 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2016-03-19 00:32:10 +0000 |
| commit | f5bc7d6909d0f532659836131fa9e2c2d038dcba (patch) | |
| tree | 9ed83c8bf4b915063ed939fc66e88eae6dbccb0f /sysutils | |
| parent | 76d0b806ee5ea30f1a33c3c27ea243d186889b30 (diff) | |
| download | pkgsrc-f5bc7d6909d0f532659836131fa9e2c2d038dcba.tar.gz | |
Removed CVS conflict lines from distinfo.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xentools42/distinfo | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo index a6a4f7ffc83..c0fc6f47a5a 100644 --- a/sysutils/xentools42/distinfo +++ b/sysutils/xentools42/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2016/01/07 17:53:58 bouyer Exp $ +$NetBSD: distinfo,v 1.23 2016/03/19 00:32:10 rillig Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -8,9 +8,6 @@ SHA1 (xen-4.2.5.tar.gz) = f42741e4ec174495ace70c4b17a6b9b0e60e798a RMD160 (xen-4.2.5.tar.gz) = 7d4f7f1b32ee541d341a756b1f8da02816438d19 SHA512 (xen-4.2.5.tar.gz) = 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac Size (xen-4.2.5.tar.gz) = 15671925 bytes -<<<<<<< distinfo -======= ->>>>>>> 1.21 SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b |