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 | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'metadata/timestamp')

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
-- 
cgit v1.2.3