From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- metadata/md5-cache/app-forensics/afl-2.55b | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'metadata/md5-cache/app-forensics/afl-2.55b') diff --git a/metadata/md5-cache/app-forensics/afl-2.55b b/metadata/md5-cache/app-forensics/afl-2.55b index c6ee1dfb5ea0..c74285ee76df 100644 --- a/metadata/md5-cache/app-forensics/afl-2.55b +++ b/metadata/md5-cache/app-forensics/afl-2.55b @@ -8,9 +8,5 @@ LICENSE=Apache-2.0 RDEPEND=sys-devel/gcc:* sys-devel/clang:= SLOT=0 SRC_URI=https://github.com/google/AFL/archive/v2.55b.tar.gz -> afl-2.55b.tar.gz -<<<<<<< HEAD -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a -======= -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a ->>>>>>> next +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 8a43b9830f1e64a7a5fc0a276afa0275 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=2bebbcec978f1ae8a73fc1434e93b682 -- cgit v1.2.3