summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/mail-mta/postfix-3.4.7
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/mail-mta/postfix-3.4.7')
-rw-r--r--metadata/md5-cache/mail-mta/postfix-3.4.74
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/mail-mta/postfix-3.4.7 b/metadata/md5-cache/mail-mta/postfix-3.4.7
index d61c2694d64a..b85aeda35742 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.4.7
+++ b/metadata/md5-cache/mail-mta/postfix-3.4.7
@@ -11,5 +11,9 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
REQUIRED_USE=ldap-bind? ( ldap sasl )
SLOT=0
SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.4.7.tar.gz
+<<<<<<< HEAD
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=72849b1a29f08932e795e73dc3ee7686