diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
tree | 76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/x11-apps/xman-1.1.5 | |
parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) |
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/md5-cache/x11-apps/xman-1.1.5')
-rw-r--r-- | metadata/md5-cache/x11-apps/xman-1.1.5 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.5 b/metadata/md5-cache/x11-apps/xman-1.1.5 index 57910dd718cb..3bc91c9f38e8 100644 --- a/metadata/md5-cache/x11-apps/xman-1.1.5 +++ b/metadata/md5-cache/x11-apps/xman-1.1.5 @@ -9,9 +9,5 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xman-1.1.5.tar.bz2 -<<<<<<< HEAD -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 -======= -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 ->>>>>>> next +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 8a43b9830f1e64a7a5fc0a276afa0275 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 _md5_=81ae23713cafb5733d8e725d0d22a5bf |