summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-libs/jemalloc-3.6.0
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-libs/jemalloc-3.6.0')
-rw-r--r--metadata/md5-cache/dev-libs/jemalloc-3.6.04
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/dev-libs/jemalloc-3.6.0 b/metadata/md5-cache/dev-libs/jemalloc-3.6.0
index 3c00b69bb070..a7a764583a4e 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-3.6.0
+++ b/metadata/md5-cache/dev-libs/jemalloc-3.6.0
@@ -8,5 +8,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sparc x86 ~a
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/3.6.0/jemalloc-3.6.0.tar.bz2
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+>>>>>>> next
_md5_=3ee75c66a2a6357c567066680aa3f8ce