diff options
Diffstat (limited to 'metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1')
| -rw-r--r-- | metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 index 17d26c98f205..c35c35f836e4 100644 --- a/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 +++ b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 @@ -10,5 +10,9 @@ RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) RESTRICT=!berkdb? ( test ) SLOT=0 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.69.0.tar.bz2 +<<<<<<< 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 _md5_=4d229876d8f69232d7d4ffbdac7287d5 |