summaryrefslogtreecommitdiff
path: root/metadata/glsa
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /metadata/glsa
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/glsa')
-rw-r--r--metadata/glsa/Manifest21
-rw-r--r--metadata/glsa/timestamp.chk4
2 files changed, 25 insertions, 0 deletions
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c425d24f00eb..e080c3f8d357 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,6 +2,7 @@
Hash: SHA512
MANIFEST Manifest.files.gz 448845 BLAKE2B 24feded351e2c02762000f35c6c58ac935b2383bf6acdd7450f974e16e15fe0935d3f657233d5cd4ab87639ad5f410b8ea36fd5c019b93bfbfc47983ef01dbdc SHA512 569d13495f7e4953afefd29435d7953d3afa1815ae86459c1f4f84726efaaedc5598835f415738d792d2d1060be50cf8ad9140b7fcf124dd7f9ea681a55957ab
+<<<<<<< HEAD
TIMESTAMP 2019-09-25T17:39:04Z
-----BEGIN PGP SIGNATURE-----
@@ -20,4 +21,24 @@ ZNiXhyj0GUCCGE7MhPS/5iICaIKnCyQz+euxeGdgBm5W7DeCzPu3aFoEgX205eVS
C5nS5G3MWndBkTOd0i1qb7YpZiAxGlTf0E8tsrTnq+pVDy9TiRXo+44V70bZHP2Z
gl6NFdRjzh7Bp/eUhVz4vv/j04OiGKc95HrCDqmKc4rwEMSkuPI=
=2rpH
+=======
+TIMESTAMP 2019-09-28T05:09:01Z
+-----BEGIN PGP SIGNATURE-----
+
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2O6u1fFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
+RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
+klCDjQ/7BAeEbEE4AmoAoFkzMoFShrp2hg/Cy4YU/9WI7l9djWWaVYNeVkqit22u
+ZkcMZkLe4H1b53L1c89DAHiwRkNHp4YikzoTIipG6JaSfwm38XrG/aS68AqWcjL6
+vE8IXEgVyuNJ/Hw0WU645gWNcfzeZ6Ck/vEidNWbeuRUK+gE6+CKmidyorD+5z9K
+4rCEZ8DQRvWcD3BZhPjcq/A+Dy4bwnPN9UFt5ycc8/vtffkdtfcSzKyiIYZ4e8p1
+M2wqKF3jeWAlQJGV/3rAQsIZsp8MDKew2dMtIHvKwQBJ11t0S4xC5ZedlwV4Kxag
+R0dDID4Mzm+QvYbEtvkN5WEwU3tkCNv9GMp7YR/3qIjyKgo/ihwiGJUiow9VGvp9
+goUBLRsDRDUwf3ueWAdVAQnroqkEo0hqASwZUcniqwXgz/TS2IlrGYOp1g0JlkGG
+7AHIyF9wDffjnI64bVp6kYHwoOF9sBmvVYN4p2QBbTWOsBPelc5hAJJRpVbiP22l
+avOVZVt0EpZP103Ya7zlFgtTa46DyCnax7lYSvCUFtA3apjsjfdmKANeAhqyOR9Z
+ucbzyrFT9aLDnPW4Fk2+QL3eLuJ2KVteYgh0UgBXEsk4dLiasbYNh+P5IOTFUq2N
+J7pPfqkCrOs5A1SakV4Jv2q9dAAzC5l2oIyXEd4apQndBef87/c=
+=ArAv
+>>>>>>> next
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a5185763581f..e5e5d106f537 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1,5 @@
+<<<<<<< HEAD
Wed, 25 Sep 2019 17:39:00 +0000
+=======
+Sat, 28 Sep 2019 05:08:57 +0000
+>>>>>>> next