summaryrefslogtreecommitdiff
path: root/metadata/dtd/timestamp.chk
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
commitbb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
treeb31a9263d386dcae4cb06764136672508dc5efdf /metadata/dtd/timestamp.chk
parent9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/dtd/timestamp.chk')
-rw-r--r--metadata/dtd/timestamp.chk6
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e5e5d106f537..df15733aa00e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/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