diff options
Diffstat (limited to 'metadata/md5-cache/x11-apps/xauth-1.1')
| -rw-r--r-- | metadata/md5-cache/x11-apps/xauth-1.1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/x11-apps/xauth-1.1 b/metadata/md5-cache/x11-apps/xauth-1.1 index 438918997d85..522e4d3b3cd2 100644 --- a/metadata/md5-cache/x11-apps/xauth-1.1 +++ b/metadata/md5-cache/x11-apps/xauth-1.1 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xauth-1.1.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 _md5_=0e9dbd99858791eac735559755d54727 |