onkelbeh
/
HomeAssistantRepository
3
4
Fork 7
Code Issues 27 Pull Requests Releases 406 Wiki Activity

update Manifest conflicts

This commit is contained in:
Andreas Billmeier 2021-06-12 21:34:25 +02:00 committed by Andreas Billmeier
parent 2e5a573acd
commit 17b53078ee
Signed by: onkelbeh
GPG Key ID: E6DB12C8C550F3C0
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-python/bizkaibus/Manifest
View File

@ -1,5 +1,5 @@
DIST bizkaibus-0.1.1.tar.gz 1837 BLAKE2B 3740b54a0000068f2ce6f0b943ab7a1ace65314fc8509a54e1ff3ce4ec2f086f64be71156e5f4a3ac5ba055e4b94d0803f62ce2ccb71c99b0f5e996650c121d5 SHA512 29bfef81d2baeb30cb62e40ed2e8a360d1db4eac09847e53f3d2c2902bbf4f47b174cf270638f8fae64d342c3f81668ba35468809a28a8d160f0fe352d08fc9b
DIST bizkaibus-0.1.4.tar.gz 1822 BLAKE2B 11f62dbed5b92013edf0ffe16afbad596490b74758e19604d19a7a1de31f733e8e8aa8ae375b1ccac41f4a4d215306926b9fc43ef33985b54495fd7e3a275c11 SHA512 fd90e5bd0247947f7a87f7893ad79a6451a40be1b429002a4951a4dc481fc128e7451c12fae9b6c0e4b9bb121448366446b5eca9770ac749c7dd369e98105ddf
EBUILD bizkaibus-0.1.1.ebuild 727 BLAKE2B 4add25f0c9a2915caa74e9b18232a22a780c3575c427ec35d87f723ed452e1e0bef07b15ee25fc8ad1a01cb075399197c6cdbd5aa7cd28ebbd863d7457e5a80d SHA512 d9715c6779ae8c049ec310ac7f34a23db00047efa80437d7fa7e83472352f662dcb7ba4170507dbbca3d48cee0ae35e2486537d6a22f924d9b4aaa857f83b466
EBUILD bizkaibus-0.1.1.ebuild 810 BLAKE2B 06c1a5538b4dfa391071f583442730064f8bfede265d9f86a292f0d424d7a1e2287a283d12f1b9e55b2a5ee2d715e4ab3aec9a1a954a2d35d1b94f50208e15f1 SHA512 27440a313731135edb6f10c228f3be5c121e0d7609b762971323ff57def062cb11708345a19b5715820e013e33955f85215f2d57b5713edd72e795b9d79a40a5
EBUILD bizkaibus-0.1.4.ebuild 735 BLAKE2B 43c20a95042bcd71b755c3b1a77ab7d5aa1ffdf1dd817967844f5a04be9a7e1e7559abca9dc3063875f06e2f05685122fc4da31b9104d6dcfeb48530d0df44ab SHA512 947e516854cf58bd3d648c378926af86e50c030b5c28136befd326318314a9eb60d7ef44acf3815ee8a03aa22a6254234474984ce13783744a02b377ddf916d6
MISC metadata.xml 457 BLAKE2B 3f508dfeb0d47c81c5de2def0e2ec3d79d8ee27e21dabea7283157475f60f03f28bd22a0477cb957e51ef32bcc1372f55b70db6c2550603f9f53136cc76957e2 SHA512 98e0c9a20e0433dc3bc46924ff897a4c214e1d39b3d1bdb5bb3362c7ecdbe7b1970f2e038c65e1b7e53fe93bf776abc61d07522113d78e5edea81757918c3fb8

7
dev-python/hbmqtt/Manifest
View File

@ -1,10 +1,5 @@
AUX hbmqtt-0.9.4-remove-tests.patch 405 BLAKE2B 46eb60c2db15865bcdb2a60da0f2826e7d42e844356f3fb77e5e58c0e73c61002f7b061324cef8762d32ef6c86b9e65476f81ebe79cc654056b66d692b4d8001 SHA512 eaddb47006ab9d530dcbd1df94a7fab5614821617f93f677f3658e1230b0387aa7b00ba47916981ceb3d3e9743b37507ec2bba78bd49b18ae3f2cce718cca1b0
AUX hbmqtt-0.9.5-remove-tests.patch 405 BLAKE2B 46eb60c2db15865bcdb2a60da0f2826e7d42e844356f3fb77e5e58c0e73c61002f7b061324cef8762d32ef6c86b9e65476f81ebe79cc654056b66d692b4d8001 SHA512 eaddb47006ab9d530dcbd1df94a7fab5614821617f93f677f3658e1230b0387aa7b00ba47916981ceb3d3e9743b37507ec2bba78bd49b18ae3f2cce718cca1b0
DIST hbmqtt-0.9.5.tar.gz 69338 BLAKE2B 7ff574b31adb3edf5a9b17bcf66d03848d2dbc5a5d2c3bb62258c0c7baa41566bb5fdfff12993219161b65c368c8f2bebc42e04d95aae20234bc20dc579a91a4 SHA512 f5b1a301268c7af300a407a1a9734ba74ced825883e6740cc9d4e2eed4db48c55f6d76e4911a69743e1db514b1f2b4a05abb2320f40c349f2ac7a1d6c38d1642
<<<<<<< HEAD
EBUILD hbmqtt-0.9.5.ebuild 740 BLAKE2B fc3704b2af7ed7eb967892200d1d5f94b8468ec91e769c6d660615a21afb4ee7e01fc8c68f11d99bc72b509ab0bddf9575ee80f223d20a5f937e19f5a865413b SHA512 670979e7be91b7136b24147c80c295c04464e7454175c8a5c4187a2dc6f4898b6301c34abeb093b651c45c8101850b0772cb24fd4765c8bbabde8710eb38ee28
=======
EBUILD hbmqtt-0.9.4.ebuild 822 BLAKE2B 8394344ab850724b95b6d3403f7f199930d01df9fc160af8de06df92d6704980b0eb662b703cb15a80a0b6262c03d230b4b93a93346f5850da0852105b542701 SHA512 69810d7e6ac07b66d56082c4db15de865e77e4022bcc1b78c89229667a9e5794e0d610b0c3c9d392246b0e90aa23425ef53c6ce1707fcfadaa756442bfaf8900
EBUILD hbmqtt-0.9.5.ebuild 824 BLAKE2B 7e08e64d1378109520d9b8d6abd3e30673930d5badd95584e65db6abce3e62f25890e09380c7b0d1747e22ddcd3236f5bc4fc2586742ac55604be56a3efeb1a8 SHA512 e85ee26350ccf30e064b67494579294698cfbb84e9282ed90a6a21c9e803a2da6a3cd8eaaa154189c61bc3d8d789c429ee385b061ec68dd48709e00f1691a290
>>>>>>> Include missing dependencies
EBUILD hbmqtt-0.9.5.ebuild 823 BLAKE2B 385c9d68e795f993558a165a776b8cbf7626227d9cb2b72232ee730a9bcb4c7a35cbf680f6e7dccb6042bdfae5338e87882352698e08047487e74f69fdef674b SHA512 c69ed48d136228044acc3806ce9d4a0d8674fad16c2d10e649c6de5183f4e9754a44aeafd60517cf2db516fee7572b68ff3c2ce22495b41a7d3f285dd4289105
MISC metadata.xml 454 BLAKE2B a5ae30ff8864371badc392aca4956e500e1a18385b4f748b705c7e85d866a44da585e29ade370643a52fc0c0f0658229b3a885c7ce5015af3e8205182ce22044 SHA512 4f9fd14c025653c79a6c9d5ae4a8f1df0b3d6e6a44a297a069591fa5864b37b5a278c439e887ed6a7164e858e82c40afd19b157011e256770356fab8b7c9fa03