summaryrefslogtreecommitdiff
path: root/metadata/xml-schema
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/xml-schema')
-rw-r--r--metadata/xml-schema/timestamp.chk6
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e5e5d106f537..df15733aa00e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/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