summaryrefslogtreecommitdiff
path: root/app-arch/lz4/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch/lz4/Manifest')
-rw-r--r--app-arch/lz4/Manifest4
1 files changed, 4 insertions, 0 deletions
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 5cad8db66880..707ce64beed8 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -3,6 +3,10 @@ DIST lz4-1.9.1.tar.gz 285336 BLAKE2B 50dfad2e92028a1ccfe186efb5dbe24e4641e104da6
DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
EBUILD lz4-1.9.1.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+<<<<<<< HEAD
EBUILD lz4-1.9.2.ebuild 914 BLAKE2B 17ccd03f4c90a6973a0bc5f7f9ee6624a9fa7adc3ea5b54c5e0359e81dd9e05e25ee0021b526faef9fa6e02fd910c553b44652ad9908c64c17229b16a2443c80 SHA512 d5db3864b0ece8d826d57dd689b0614329b1fc4ca6492829056cb12883fa8110822781aadbc6fb9cf9c96d3a22ddd0f9dd200093adea582028c2592321479cb5
+=======
+EBUILD lz4-1.9.2.ebuild 911 BLAKE2B ce27a83c0cb654c501ddc75529a5474e9eb1c4b91b19cd4681f740b188df16e3fcea491de6a6a383ff4be326a70000ee5f60b608aa7503f651e9902526e0d72f SHA512 d33c13af38282e5c3afdc5e61f55f2b40973c06555d5db61bd412185179b5103221babebca007dab72ad7615d4a79c6c5059442bc152ddb0b94f5e9dc0e843d0
+>>>>>>> next
EBUILD lz4-9999.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699