diff options
Diffstat (limited to 'dev-libs/nss/Manifest')
| -rw-r--r-- | dev-libs/nss/Manifest | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 55e319103239..2b9863c39fe6 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -10,5 +10,9 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 EBUILD nss-3.40.1-r1.ebuild 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088 +<<<<<<< HEAD EBUILD nss-3.46.ebuild 9479 BLAKE2B 1a97bcd13b5876f8f2e1856831a303107728ffa54383ef5e8dd83b754cd3e4d0a8ad4aa3318e83d73b97212c7ab58cbe80d6fd99c3c6a96c866ba5facc7a696c SHA512 7b7df99a2897afae6f0860bf8a33598ed46bddfba7ef9cddbf7ac5913a59612af99e80212cb41e30651aa86a50a0c5f07cbafa259e496ed0fdfc099c56133da6 +======= +EBUILD nss-3.46.ebuild 9478 BLAKE2B ce357178071d9b93eb2e9838ff8870332bdc4790b1f016d5b54ff6b4df62e2293f5fb5a866f61df1e70f7847bc4dcea3b3767b868801908daed4b4d324e462a1 SHA512 53689f8bc455f6256302a8941813bf7ef4e6e7d8b8cb27aff1df19b55cbefc461706eca7e97f1a56ce7701a0d760064cc821e73b32b609fab1f050b72d65d6c4 +>>>>>>> next MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0 |