summaryrefslogtreecommitdiff
path: root/metadata/news
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /metadata/news
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/news')
-rw-r--r--metadata/news/Manifest49
-rw-r--r--metadata/news/timestamp.chk6
2 files changed, 15 insertions, 40 deletions
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9a1d1810a35e..b3228eaf5c2e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,43 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 12431 BLAKE2B 01f85214679133e11f407d3d98aa7199014e62beb28441547ec80fbf152782842031346f8533b9d9dbab149da60f2faf8cc88276588df64076b57a424b536879 SHA512 46b9e6743aa054c2ca0f0a099c41383157eef0c6ca41b382f82afde381fedcfd5d2f0f05669d0c25db300bd3525ee0dcc8a7e3841488b1b176e1b611182af55a
-<<<<<<< HEAD
-TIMESTAMP 2019-09-25T17:39:04Z
+TIMESTAMP 2019-10-13T20:38:57Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2LpjhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2ji2FfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBxdA//flXZlqLKJOpvxTpTDcpEPX0etVf5jz8W8SrBKzaar/fY6U4j5Wd2cdwT
-GK5+riskK/nPbZhPFS5+vBnW5aYYqYCqpU5g7Uy0eBX3FHAaGVh9B9MfcoVTbz9M
-q3V8SYnzANxoVuzn+KZJuJgzMuoEpvrjeqwvtSUeynQ1U9HxJg0LTuvldBmLJ2E/
-IsPX5o8NxJPyvHb8IPdIbvY1RTwIffYyXsMEeqlFUB639FSFC7rRYqfTpSdzUt4/
-AxfYZWhBiqMuma7k7ytw/Nz72HlYbXtSr9zpLRl5c1FY4QYrN5VqMjR2barL/2Qd
-0rtU/nFXzLwJ38ByXeJVlhyddQ0hAT1aiSQ/KTp5B3sB74t3gd+mKUlFzmXwE0jx
-1ACWini+8ea4+2xDSyNSzMXpUewuca43Gc/A+tfJrLH5m+xfAF+MnurfUDWA/+wz
-I9KU9f1bWEqXxPbjP9nHBDQlv+OQ+ibSpgDSfWe9ezG8md9DONgxr+zXQnBgn9MQ
-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
+klCz0A//VQ3l6gyRV/Z7f1R4Y5rX6JSxd3YoX+s+kHiuuUDwJG42v2fllPfgPLmV
+vxYdVyBQz7sv79kiAmhr4XS/K1xwQ/OvklMt47EMNaj7m1NWHNhgG+Z2jUB3PxLk
+3CfvgFTQsfCD2vP9aswcV73ZmX+y7RpkookL5Kcl5rO81qEmBFiEzZxfEGopay7l
+KAyJoZgbFTr9C2/J4y8H1kkQFGKyoun9HM5SzVliT0Pvgj1nyGhUAv8KClO/FKnh
+47BDDBRtnxzm5+zw6kXW26QWl+8Sa4pppLzMOL1rEcBR4+sG3p6Imz7PlzYliMOI
+RwYkRbyR/8ir6EBwpmP45p6w4blHSGfbu/A9zKX0CsF9kyVWrjA0vggeP9k2SQ5f
+JNOzLrZ7eiSSap+4r4oM59JrEQ0BePCVZBPmgOe9hfNe4jgh9PCVSEzJxT3evOzY
+i9p9BRIf1KoYro6t7stxj+7ehR30IS9GyeWVexdfHY+69u9aW7NtpTTgMQu9tMHU
+9ovIcq3lEXp0CU4BUGne3rFWeGXAza86HUgwljdNArSSBJvC5gOoa/zSo4T0zfWB
+4ckl8JPqDVoefFifIR87QZ23jfniHIpY/KI8T9nZoYTTdj5K2yJKZPTsXkUXstD3
+IzL0ynkd9RgzX03Ed0UwWsVKRNpyOKukSHJC3aN2ctM6GlH0+1k=
+=Ba14
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e5e5d106f537..df15733aa00e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Wed, 25 Sep 2019 17:39:00 +0000
-=======
-Sat, 28 Sep 2019 05:08:57 +0000
->>>>>>> next
+Sun, 13 Oct 2019 20:38:54 +0000