summaryrefslogtreecommitdiff
path: root/metadata/timestamp
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/timestamp
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/timestamp')
-rw-r--r--metadata/timestamp6
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/timestamp b/metadata/timestamp
index ee5f1bcace62..49372a6e6e14 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Wed Sep 25 17:39:00 UTC 2019
-=======
-Sat Sep 28 05:08:57 UTC 2019
->>>>>>> next
+Sun Oct 13 20:38:54 UTC 2019