summaryrefslogtreecommitdiff
path: root/metadata/news
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/news
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/news')
-rw-r--r--metadata/news/Manifest21
-rw-r--r--metadata/news/timestamp.chk4
2 files changed, 25 insertions, 0 deletions
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 8109410175ba..9a1d1810a35e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,6 +2,7 @@
Hash: SHA512
MANIFEST Manifest.files.gz 12431 BLAKE2B 01f85214679133e11f407d3d98aa7199014e62beb28441547ec80fbf152782842031346f8533b9d9dbab149da60f2faf8cc88276588df64076b57a424b536879 SHA512 46b9e6743aa054c2ca0f0a099c41383157eef0c6ca41b382f82afde381fedcfd5d2f0f05669d0c25db300bd3525ee0dcc8a7e3841488b1b176e1b611182af55a
+<<<<<<< HEAD
TIMESTAMP 2019-09-25T17:39:04Z
-----BEGIN PGP SIGNATURE-----
@@ -20,4 +21,24 @@ Bfo6drVEBmT/t6GrSwDjrIhv48FFGdtsjWXemPAmlT/uhpq6Q2DS/n7lfrRpn+Ym
8VUaGx3NytNQmjN5dG4HqpdEw7OkZppwJT/HE/uIdsFtXK8jSD85R8W4ri62Z2X/
2UEmAvCQn22SXR9rUrMkBUtVaBe/fUFJkPcwiXnqFiZqkdDJkPY=
=IV1I
+=======
+TIMESTAMP 2019-09-28T05:09:01Z
+-----BEGIN PGP SIGNATURE-----
+
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2O6u1fFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
+RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
+klACMA/9GC/yoNe0ljAZE4C/x2Px+IMLWBPX0rHo+3/Fo7Iit6AfH9Lu3kGFbb7N
+A1yLfaJJBr+6XNzJvmI7cJmB8YDH+V2UelRN5zN6YtF1Svb0E5yFBSYExZLo5I6/
+3Uoqr90PNhLP4Hzwzivh45I3a4SgO8bloIHGM9xQKFWQEfCopSW1CHr4jeIcY13D
+WPx+YKUirU82wOy0gyPYcaduyMB1R0eUwb3Ii+zx3i79q3nf9f/Nrlfa4l/PaXlI
+vuJylTOM/O7wqtQJRsPJjyWhhNLHdWqUFnWiMyUlj/v3m5hOnfXlItdKi7wgCJPz
++IShJeQCifg3v4Fb2ZGF5TU13YwTrpmk3ylwCXpbLRFAdf+npWvs8dsjR3fWSfoj
+1GwEVl1TdAe+71Rhvyu8wV+jspAGMbwrDYXGlAv+uINGafijHFymo0lQjPx0YblX
+i04HEsmb+RDAXe6n1DF0LZIl5cntxq1JdLABuYrI7We8NRNB0acpGb635nt6vZDy
+cmD4EjCu50DIPF330VYw9tQAq+m8cT7lfgwkhVCU/HAN0lPHGMQYMfuX7B9+gAYF
+Xmg/laSIPqXiOk//qjQYH33vWgEGixdm9dFe4pL2eTxwHWsngzEP0YUdrLyubhBT
+CL55Hp6tOfOPFzLuSyKqBUM0xNONI3G4nMAbm8TkgLYp+Xn86Ks=
+=5GuR
+>>>>>>> next
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a5185763581f..e5e5d106f537 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1,5 @@
+<<<<<<< HEAD
Wed, 25 Sep 2019 17:39:00 +0000
+=======
+Sat, 28 Sep 2019 05:08:57 +0000
+>>>>>>> next