summaryrefslogtreecommitdiff
path: root/net-dns/dnsmasq/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'net-dns/dnsmasq/Manifest')
-rw-r--r--net-dns/dnsmasq/Manifest4
1 files changed, 4 insertions, 0 deletions
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 7b71a162652f..c1b877025e50 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,6 +8,10 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
+<<<<<<< HEAD
EBUILD dnsmasq-2.80-r1.ebuild 4803 BLAKE2B f596685ea68a061c1319b6f49c9d27089bc0ef36822d6074cc70e02155d4866a97c2059077901b0576c96bf09ba6328bb74bc6f720553e635ca3758381ac05f9 SHA512 69fd9a952d9414842bc9cabec39b3ab065010ebcd93c6804208d7fb6085e0917c9a00679cc84b36fef2591b3bf838319a5d4f94f499f5d25b197ed9b28f944d7
+=======
+EBUILD dnsmasq-2.80-r1.ebuild 4798 BLAKE2B e9b667e47e20493d66035efca9db5e6f9095f899c58b6c8191d16d650806b6d5a981edb5aceaeaded932259257d2a7ec212dcc4a6a88c8e465ad48014562863b SHA512 5f6a03704fdf8eb3e7c50e4a0637ab2894caa8bfe054c20001a46cb55c58733254a8a0a968f9732276305667810d5c7001ba5a27e30d24fa2116d7e326fcb6ac
+>>>>>>> next
EBUILD dnsmasq-2.80.ebuild 4684 BLAKE2B 64850d70d7fe613c4e3b89944052ccba458f702e59f6d3f6b5228d4a32e65221c64a7ae9a168edd9499723276f0b8fab10a1f97d4b5eaab89c6c87359e7f652d SHA512 0a14dca3228b931f646d465de4426d2e48ae4e4a1c76637620e8a4d6e9c5cfd877ffd34b2841508a405749626e5fb6299cae5485a2529ca79cf891f66d4897a2
MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc