summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-apps/fakeroot-1.24
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-apps/fakeroot-1.24
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/md5-cache/sys-apps/fakeroot-1.24')
-rw-r--r--metadata/md5-cache/sys-apps/fakeroot-1.246
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.24 b/metadata/md5-cache/sys-apps/fakeroot-1.24
index e3a0641281f4..d7a7e814abb9 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.24
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.24
@@ -9,9 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-lin
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.24.orig.tar.gz
-<<<<<<< HEAD
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
-=======
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
->>>>>>> next
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 8a43b9830f1e64a7a5fc0a276afa0275 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=cac7d9b96e20c835fb527a8eaf0103af