From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 13 Oct 2019 22:19:36 +0100
Subject: gentoo resync : 13.10.2019

---
 metadata/timestamp.chk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'metadata/timestamp.chk')

diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5c9c0411d7a7..a23bc675d407 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Wed, 25 Sep 2019 17:45:01 +0000
-=======
-Sat, 28 Sep 2019 05:15:01 +0000
->>>>>>> next
+Sun, 13 Oct 2019 20:45:01 +0000
-- 
cgit v1.2.3