summaryrefslogtreecommitdiff
path: root/metadata/timestamp
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/timestamp
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/timestamp')
-rw-r--r--metadata/timestamp4
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/timestamp b/metadata/timestamp
index 0f2a270ab296..ee5f1bcace62 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
Wed Sep 25 17:39:00 UTC 2019
+=======
+Sat Sep 28 05:08:57 UTC 2019
+>>>>>>> next