summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/net-dns/bind-9.14.5
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/net-dns/bind-9.14.5')
-rw-r--r--metadata/md5-cache/net-dns/bind-9.14.54
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/net-dns/bind-9.14.5 b/metadata/md5-cache/net-dns/bind-9.14.5
index b26f6852c34d..55b1cadf6c02 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.5
+++ b/metadata/md5-cache/net-dns/bind-9.14.5
@@ -12,5 +12,9 @@ REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz
RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.5/bind-9.14.5.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=690d0dfaca5b73dc2c7c199a7419ba94