diff options
Diffstat (limited to 'www-client/google-chrome-unstable/Manifest')
| -rw-r--r-- | www-client/google-chrome-unstable/Manifest | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index 6a2ece1b1225..799321c6e62f 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,3 +1,8 @@ +<<<<<<< HEAD DIST google-chrome-unstable_78.0.3904.17-1_amd64.deb 64972850 BLAKE2B 88812fa32376b4dbc85b8dfbd38d30ab592c5eb01c57a4230d451b5855565addeb3b2bfb7e59b7cb622dc24bea67d0ab58db51ba6e38642d54f62f9b9ff3fc4e SHA512 edd2599acea92b73e912b8d8ec95549a29af16c636b6ec38a74ca464dcdbe6e46e63c34a74d0135a4d34fc6c91d3e89eee25d078f0b130b905cac67c1ed4037f EBUILD google-chrome-unstable-78.0.3904.17.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 +======= +DIST google-chrome-unstable_79.0.3921.0-1_amd64.deb 65310386 BLAKE2B dbab67768d7fd0fe5fcef6073dbb6ad6891831812e2adf04974ed7820ab01201104889992df4c491a497be2ceda16b858f9b916358b55f3e58b547489c3ee97a SHA512 71c1bd003aa0bc80b477d1b47e33890f26f8c6a8aa2822d4da5f70c736384e884f04be1583daa2b27ecbb21b79d9b16eabceffdf0f98d691f84ec64bbf4fa73a +EBUILD google-chrome-unstable-79.0.3921.0.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 +>>>>>>> next MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57 |