diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /metadata/timestamp.x | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/timestamp.x')
| -rw-r--r-- | metadata/timestamp.x | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/timestamp.x b/metadata/timestamp.x index fe66260b8976..fc7010cbb6d8 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1,5 +1 @@ -<<<<<<< HEAD -1569432901 Wed 25 Sep 2019 05:35:01 PM UTC -======= -1569647101 Sat 28 Sep 2019 05:05:01 AM UTC ->>>>>>> next +1570998901 Sun 13 Oct 2019 08:35:01 PM UTC |