diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2')
| -rw-r--r-- | metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 index 727c43a7b2c4..817ddd9f206c 100644 --- a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 +++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 @@ -12,5 +12,9 @@ REQUIRED_USE=kerberos? ( nfsv4 ) RESTRICT=test SLOT=0 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2 +<<<<<<< HEAD _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5f189f811c97261454748401963ed82b |