diff options
Diffstat (limited to 'metadata/md5-cache/net-dns/dnsmasq-2.80')
| -rw-r--r-- | metadata/md5-cache/net-dns/dnsmasq-2.80 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80 b/metadata/md5-cache/net-dns/dnsmasq-2.80 index 6ca7c5a23fe6..75de98381446 100644 --- a/metadata/md5-cache/net-dns/dnsmasq-2.80 +++ b/metadata/md5-cache/net-dns/dnsmasq-2.80 @@ -11,5 +11,9 @@ RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn ) SLOT=0 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz +<<<<<<< HEAD _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=3b9bb437795b373cda42fe6fda4b4a4b |