summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta')
-rw-r--r--metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta6
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta b/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta
index 39b1a140d5af..39d4adcded23 100644
--- a/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta
+++ b/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta
@@ -10,9 +10,5 @@ LICENSE=BSD-2
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://dev.gentoo.org/~mgorny/dist/netbsd-csu-9.0_beta.tar.xz test? ( https://dev.gentoo.org/~mgorny/dist/netbsd-csu-7.1-tests.tar.bz2 )
-<<<<<<< HEAD
-_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability 2b88d3ecc35035a3b8ab628b49cafb0e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
-=======
-_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability 2b88d3ecc35035a3b8ab628b49cafb0e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
->>>>>>> next
+_eclasses_=bsdmk 1e1d0b64b7855d37251d4667ce1f6f30 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 8a43b9830f1e64a7a5fc0a276afa0275 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability 2b88d3ecc35035a3b8ab628b49cafb0e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=16bb5a72e4f024899c96a5256e5b512c